##// END OF EJS Templates
merge: move dr/rd warning messages out of applyupdates()...
merge: move dr/rd warning messages out of applyupdates() As preparation for making 'dr' and 'rd' actions no longer actions, move the reporting from applyupdates() to its caller update(). This way we won't have to pass additonal arguments to applyupdates() when they are no longer actions. Also, the warnings are equally unrelated to applyupdates() as they are to recordupdates(), as they don't result in any changes to either the working copy or the dirstate. See earlier patch for additional motivation.

File last commit:

r17490:a03c3ba3 default
r23525:5126d771 default
Show More
test-debugindexdot.t
25 lines | 435 B | text/troff | Tads3Lexer
/ tests / test-debugindexdot.t
timeless@mozdev.org
spelling: exercise
r17490 Just exercise debugindexdot
Pradeepkumar Gayam
tests: unify tests-debugindexdot
r11923 Create a short file history including a merge.
$ hg init t
$ cd t
$ echo a > a
$ hg ci -qAm t1 -d '0 0'
$ echo a >> a
$ hg ci -m t2 -d '1 0'
$ hg up -qC 0
$ echo b >> a
$ hg ci -m t3 -d '2 0'
created new head
$ HGMERGE=true hg merge -q
$ hg ci -m merge -d '3 0'
$ hg debugindexdot .hg/store/data/a.i
digraph G {
-1 -> 0
0 -> 1
0 -> 2
2 -> 3
1 -> 3
}
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..