MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Yann Cébron
2014-05-08 16:48:17 +02:00
parent 001903ab45 48d9080e39
commit 5743b43ff9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgUpdateCommand.java
+2 -1
View File
@@ -101,7 +101,8 @@ public class HgUpdateCommand {
}
private static boolean detectLocalChangeConflict(HgCommandResult result) {
final Pattern UNCOMMITTED_PATTERN = Pattern.compile(".*abort.*uncommitted.*changes.*", Pattern.DOTALL);
// error messages from mercurial after update command: "abort: outstanding uncommitted merges", "abort: uncommitted changes"
final Pattern UNCOMMITTED_PATTERN = Pattern.compile(".*abort.*uncommitted\\s*(changes|merges).*", Pattern.DOTALL);
Matcher matcher = UNCOMMITTED_PATTERN.matcher(result.getRawError());
return matcher.matches();
}