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

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

merge: don't report progress for dr/rd actions...
merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.
Mads Kiilerich - - Load All Authors

File last commit:

r23517:4f18e80d default
r23524:a1a7c94d default
Show More
test-bookmarks-rebase.t
68 lines | 1.3 KiB | text/troff | Tads3Lexer
/ tests / test-bookmarks-rebase.t
History | Source | Raw |Copy content |Copy permalink
Martin Geisler
tests: unify test-bookmarks-rebase
 r11863 $ echo "[extensions]" >> $HGRCPATH
$ echo "rebase=" >> $HGRCPATH
initialize repository
$ hg init
$ echo 'a' > a
$ hg ci -A -m "0"
adding a
$ echo 'b' > b
$ hg ci -A -m "1"
adding b
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo 'c' > c
$ hg ci -A -m "2"
adding c
created new head
$ echo 'd' > d
$ hg ci -A -m "3"
adding d
$ hg bookmark -r 1 one
$ hg bookmark -r 3 two
Sean Farley
bookmarks: fix bug that activated a bookmark even with -r passed...
 r19112 $ hg up -q two
Martin Geisler
tests: unify test-bookmarks-rebase
 r11863
bookmark list
$ hg bookmark
David Soria Parra
localrepo: sort hg bookmark output...
 r13388 one 1:925d80f479bb
Martin Geisler
tests: unify test-bookmarks-rebase
 r11863 * two 3:2ae46b1d99a7
rebase
Nicolas Dumazet
tests: use regular expressions instead of helpers
 r11907 $ hg rebase -s two -d one
Mads Kiilerich
rebase: show more useful status information while rebasing...
 r23517 rebasing 3:2ae46b1d99a7 "3" (tip two)
Mads Kiilerich
tests: make 'saved backup' globbing less narrow in rebase tests...
 r23516 saved backup bundle to $TESTTMP/.hg/strip-backup/2ae46b1d99a7-backup.hg (glob)
Martin Geisler
tests: unify test-bookmarks-rebase
 r11863
$ hg log
Pierre-Yves David
rebase: do not add second parent to rebased changeset (drop detach option) (BC)...
 r17005 changeset: 3:42e5ed2cdcf4
David Soria Parra
templater: add bookmarks to templates and default output...
 r13386 bookmark: two
Martin Geisler
tests: unify test-bookmarks-rebase
 r11863 tag: tip
parent: 1:925d80f479bb
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 3
changeset: 2:db815d6d32e6
parent: 0:f7b1eb17ad24
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 2
changeset: 1:925d80f479bb
David Soria Parra
bookmarks: make track.current=True default behaviour and remove option (BC)
 r13416 bookmark: one
Martin Geisler
tests: unify test-bookmarks-rebase
 r11863 user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 1
changeset: 0:f7b1eb17ad24
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0