##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

context: possibly yield initial fctx in blockdescendants()...
context: possibly yield initial fctx in blockdescendants() If initial 'fctx' has changes in line range with respect to its parents, we yield it first. This makes 'followlines(..., descend=True)' consistent with 'descendants()' revset which yields the starting revision. We reuse one iteration of blockancestors() which does exactly what we want. In test-annotate.t, adjust 'startrev' in one case to cover the situation where the starting revision does not touch specified line range.
Gábor Stefanik - - Load All Authors

File last commit:

r30229:69ffbbe7 stable
r31992:3e47a40d default
Show More
test-merge-local.t
151 lines | 3.4 KiB | text/troff | Tads3Lexer
/ tests / test-merge-local.t
History | Source | Raw |Copy content |Copy permalink
Adrian Buehlmann
tests: unify test-merge-local
 r12258 $ hg init
Revision 0:
$ echo "unchanged" > unchanged
$ echo "remove me" > remove
$ echo "copy me" > copy
$ echo "move me" > move
$ for i in 1 2 3 4 5 6 7 8 9; do
> echo "merge ok $i" >> zzz1_merge_ok
> done
$ echo "merge bad" > zzz2_merge_bad
$ hg ci -Am "revision 0"
adding copy
adding move
adding remove
adding unchanged
adding zzz1_merge_ok
adding zzz2_merge_bad
Revision 1:
$ hg rm remove
$ hg mv move moved
$ hg cp copy copied
$ echo "added" > added
$ hg add added
$ echo "new first line" > zzz1_merge_ok
$ hg cat zzz1_merge_ok >> zzz1_merge_ok
$ echo "new last line" >> zzz2_merge_bad
$ hg ci -m "revision 1"
Local changes to revision 0:
$ hg co 0
4 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ echo "new last line" >> zzz1_merge_ok
$ echo "another last line" >> zzz2_merge_bad
$ hg diff --nodates | grep "^[+-][^<>]"
--- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
+new last line
--- a/zzz2_merge_bad
+++ b/zzz2_merge_bad
+another last line
$ hg st
M zzz1_merge_ok
M zzz2_merge_bad
Local merge with bad merge tool:
$ HGMERGE=false hg co
merging zzz1_merge_ok
merging zzz2_merge_bad
merging zzz2_merge_bad failed!
3 files updated, 1 files merged, 2 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
Matt Mackall
tests: add exit codes to unified tests
 r12316 [1]
Adrian Buehlmann
tests: unify test-merge-local
 r12258
Martin von Zweigbergk
merge: refuse update/merge if there are unresolved conflicts (BC)...
 r27316 $ hg resolve -m
(no more unresolved files)
Adrian Buehlmann
tests: unify test-merge-local
 r12258 $ hg co 0
merging zzz1_merge_ok
merging zzz2_merge_bad
Siddharth Agarwal
simplemerge: move conflict warning message to filemerge...
 r26614 warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
Gábor Stefanik
merge: avoid superfluous filemerges when grafting through renames (issue5407)...
 r30229 2 files updated, 1 files merged, 3 files removed, 1 files unresolved
Adrian Buehlmann
tests: unify test-merge-local
 r12258 use 'hg resolve' to retry unresolved file merges
Matt Mackall
tests: add exit codes to unified tests
 r12316 [1]
Adrian Buehlmann
tests: unify test-merge-local
 r12258
$ hg diff --nodates | grep "^[+-][^<>]"
--- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
+new last line
--- a/zzz2_merge_bad
+++ b/zzz2_merge_bad
+another last line
+=======
$ hg st
M zzz1_merge_ok
M zzz2_merge_bad
? zzz2_merge_bad.orig
Local merge with conflicts:
Martin von Zweigbergk
merge: refuse update/merge if there are unresolved conflicts (BC)...
 r27316 $ hg resolve -m
(no more unresolved files)
Adrian Buehlmann
tests: unify test-merge-local
 r12258 $ hg co
merging zzz1_merge_ok
merging zzz2_merge_bad
Siddharth Agarwal
simplemerge: move conflict warning message to filemerge...
 r26614 warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
Adrian Buehlmann
tests: unify test-merge-local
 r12258 3 files updated, 1 files merged, 2 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
Matt Mackall
tests: add exit codes to unified tests
 r12316 [1]
Adrian Buehlmann
tests: unify test-merge-local
 r12258
Martin von Zweigbergk
merge: refuse update/merge if there are unresolved conflicts (BC)...
 r27316 $ hg resolve -m
(no more unresolved files)
Christian Delahousse
filemerge: choose where .orig files are kept...
 r26941 $ hg co 0 --config 'ui.origbackuppath=.hg/origbackups'
Adrian Buehlmann
tests: unify test-merge-local
 r12258 merging zzz1_merge_ok
merging zzz2_merge_bad
Siddharth Agarwal
simplemerge: move conflict warning message to filemerge...
 r26614 warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark')
Gábor Stefanik
merge: avoid superfluous filemerges when grafting through renames (issue5407)...
 r30229 2 files updated, 1 files merged, 3 files removed, 1 files unresolved
Adrian Buehlmann
tests: unify test-merge-local
 r12258 use 'hg resolve' to retry unresolved file merges
Matt Mackall
tests: add exit codes to unified tests
 r12316 [1]
Adrian Buehlmann
tests: unify test-merge-local
 r12258
Christian Delahousse
filemerge: choose where .orig files are kept...
 r26941 Are orig files from the last commit where we want them?
$ ls .hg/origbackups
zzz2_merge_bad.orig
Adrian Buehlmann
tests: unify test-merge-local
 r12258 $ hg diff --nodates | grep "^[+-][^<>]"
--- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
+new last line
--- a/zzz2_merge_bad
+++ b/zzz2_merge_bad
+another last line
+=======
+=======
+new last line
+=======
$ hg st
M zzz1_merge_ok
M zzz2_merge_bad
? zzz2_merge_bad.orig
Local merge without conflicts:
$ hg revert zzz2_merge_bad
Martin von Zweigbergk
merge: refuse update/merge if there are unresolved conflicts (BC)...
 r27316 $ hg resolve -m
(no more unresolved files)
Adrian Buehlmann
tests: unify test-merge-local
 r12258 $ hg co
merging zzz1_merge_ok
4 files updated, 1 files merged, 2 files removed, 0 files unresolved
$ hg diff --nodates | grep "^[+-][^<>]"
--- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
+new last line
$ hg st
M zzz1_merge_ok
? zzz2_merge_bad.orig