##// END OF EJS Templates
mq: pop/refresh: avoid losing revisions not managed by mq...
mq: pop/refresh: avoid losing revisions not managed by mq We already disallow committing on top of an mq revision exactly to avoid losing this new revision during a qpop/qrefresh, so this can be seen as an additional safety check. If this is not enough to fix issue844, it should at least prevent it from happening.

File last commit:

r4417:0912d8df merge default
r5980:dcda0c90 default
Show More
test-merge-local.out
67 lines | 1.7 KiB | text/plain | TextLexer
/ tests / test-merge-local.out
Thomas Arendsen Hein
Add instructions how to redo/finish failed merge with local working directory....
r3869 # revision 0
adding copy
adding move
adding remove
adding unchanged
adding zzz1_merge_ok
adding zzz2_merge_bad
# revision 1
# local changes to revision 0
4 files updated, 0 files merged, 3 files removed, 0 files unresolved
--- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
+new last line
--- a/zzz2_merge_bad
+++ b/zzz2_merge_bad
+another last line
M zzz1_merge_ok
M zzz2_merge_bad
# local merge with bad merge tool
merging zzz1_merge_ok
merging zzz1_merge_ok failed!
merging zzz2_merge_bad
merging zzz2_merge_bad failed!
Matt Mackall
merge: fix spurious merges for copies in linear updates...
r4416 3 files updated, 0 files merged, 2 files removed, 2 files unresolved
Thomas Arendsen Hein
Add instructions how to redo/finish failed merge with local working directory....
r3869 There are unresolved merges with locally modified files.
You can redo the full merge using:
hg update 0
hg update 1
2 files updated, 0 files merged, 3 files removed, 0 files unresolved
--- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
+new last line
--- a/zzz2_merge_bad
+++ b/zzz2_merge_bad
+another last line
M zzz1_merge_ok
M zzz2_merge_bad
# local merge with conflicts
Alexis S. L. Carvalho
change tests to use simplemerge by default
r4365 warning: conflicts during merge.
Thomas Arendsen Hein
Add instructions how to redo/finish failed merge with local working directory....
r3869 merging zzz1_merge_ok
merging zzz2_merge_bad
merging zzz2_merge_bad failed!
Matt Mackall
merge: fix spurious merges for copies in linear updates...
r4416 3 files updated, 1 files merged, 2 files removed, 1 files unresolved
Thomas Arendsen Hein
Add instructions how to redo/finish failed merge with local working directory....
r3869 There are unresolved merges with locally modified files.
You can finish the partial merge using:
hg update 0
hg update 1
2 files updated, 0 files merged, 3 files removed, 0 files unresolved
--- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
+new first line
+new last line
--- a/zzz2_merge_bad
+++ b/zzz2_merge_bad
+another last line
+=======
+new last line
M zzz1_merge_ok
M zzz2_merge_bad
# local merge without conflicts
merging zzz1_merge_ok
Matt Mackall
merge: fix spurious merges for copies in linear updates...
r4416 4 files updated, 1 files merged, 2 files removed, 0 files unresolved
Thomas Arendsen Hein
Add instructions how to redo/finish failed merge with local working directory....
r3869 --- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
+new last line
M zzz1_merge_ok
? zzz2_merge_bad.orig