##// END OF EJS Templates
tests: fix the detection of dirstate-v2 in hghave.py
tests: fix the detection of dirstate-v2 in hghave.py

File last commit:

r45219:16c36115 default
r50515:8cd39c20 stable
Show More
test-issue1175.t
96 lines | 2.0 KiB | text/troff | Tads3Lexer
Matt Mackall
urls: bulk-change BTS urls to new location
r26420 https://bz.mercurial-scm.org/1175
Adrian Buehlmann
tests: unify test-issue*
r12195
$ hg init
$ touch a
$ hg ci -Am0
adding a
$ hg mv a a1
$ hg ci -m1
$ hg co 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg mv a a2
$ hg up
Dan Villiom Podlaski Christiansen
merge: make 'diverging renames' diagnostic a more helpful note....
r12757 note: possible conflict - a was renamed multiple times to:
Martin von Zweigbergk
copies: print list of divergent renames in sorted order...
r42279 a1
Adrian Buehlmann
tests: unify test-issue*
r12195 a2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg ci -m2
$ touch a
$ hg ci -Am3
adding a
$ hg mv a b
$ hg ci -Am4 a
$ hg ci --debug --traceback -Am5 b
Mads Kiilerich
localrepo: show headline notes in commitctx before showing filenames...
r23749 committing files:
Adrian Buehlmann
tests: unify test-issue*
r12195 b
Ryan McElroy
commit: remove reverse search for copy source when not in parent (issue4476)...
r23929 warning: can't find ancestor for 'b' copied from 'a'!
Mads Kiilerich
localrepo: show headline notes in commitctx before showing filenames...
r23749 committing manifest
committing changelog
Pierre-Yves David
caches: move the 'updating the branch cache' message in 'updatecaches'...
r32267 updating the branch cache
Ryan McElroy
commit: remove reverse search for copy source when not in parent (issue4476)...
r23929 committed changeset 5:83a687e8a97c80992ba385bbfd766be181bfb1d1
Adrian Buehlmann
tests: unify test-issue*
r12195
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 6 changesets with 4 changes to 4 files
Adrian Buehlmann
tests: unify test-issue*
r12195
$ hg export --git tip
# HG changeset patch
# User test
# Date 0 0
Mads Kiilerich
export: show 'Date' header in a format that also is readable for humans...
r18648 # Thu Jan 01 00:00:00 1970 +0000
Ryan McElroy
commit: remove reverse search for copy source when not in parent (issue4476)...
r23929 # Node ID 83a687e8a97c80992ba385bbfd766be181bfb1d1
Matt Mackall
setparents: drop copies from dropped p2 (issue3843)
r18739 # Parent 1d1625283f71954f21d14c3d44d0ad3c019c597f
Adrian Buehlmann
tests: unify test-issue*
r12195 5
diff --git a/b b/b
new file mode 100644
av6
tests: update bugzilla link in test-issue1175.t
r29680 https://bz.mercurial-scm.org/show_bug.cgi?id=4476
Ryan McElroy
commit: remove reverse search for copy source when not in parent (issue4476)...
r23929
$ hg init foo
$ cd foo
$ touch a && hg ci -Aqm a
$ hg mv a b
$ echo b1 >> b
$ hg ci -Aqm b1
$ hg up 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg mv a b
$ echo b2 >> b
$ hg ci -Aqm b2
$ hg graft 1
grafting 1:5974126fad84 "b1"
merging b
Siddharth Agarwal
simplemerge: move conflict warning message to filemerge...
r26614 warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
Ryan McElroy
commit: remove reverse search for copy source when not in parent (issue4476)...
r23929 abort: unresolved conflicts, can't continue
timeless
graft: use single quotes around command hint...
r28963 (use 'hg resolve' and 'hg graft --continue')
Valentin Gatien-Baron
graft: exit 1 on conflicts, like merge...
r45219 [1]
Ryan McElroy
commit: remove reverse search for copy source when not in parent (issue4476)...
r23929 $ echo a > b
$ echo b3 >> b
$ hg resolve --mark b
(no more unresolved files)
timeless
graft: hook afterresolvedstates
r27625 continue: hg graft --continue
Ryan McElroy
commit: remove reverse search for copy source when not in parent (issue4476)...
r23929 $ hg graft --continue
grafting 1:5974126fad84 "b1"
$ hg log -f b -T 'changeset: {rev}:{node|short}\nsummary: {desc}\n\n'
changeset: 3:376d30ccffc0
summary: b1
changeset: 2:416baaa2e5e4
summary: b2
changeset: 0:3903775176ed
summary: a