##// END OF EJS Templates
rebase: remove "if True"...
rebase: remove "if True" The "if True" block was to make the last patch easier to review. This patch removes "if True" and unindents the block.

File last commit:

r28064:9e0535da default
r33333:8bfd10e4 default
Show More
test-issue1502.t
41 lines | 1.1 KiB | text/troff | Tads3Lexer
Matt Mackall
urls: bulk-change BTS urls to new location
r26420 https://bz.mercurial-scm.org/1502
David Soria Parra
bookmarks: restrict moving a bookmark to its descendants (issue1502)...
r13478
Initialize repository
$ hg init foo
$ touch foo/a && hg -R foo commit -A -m "added a"
adding a
$ hg clone foo foo1
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo "bar" > foo1/a && hg -R foo1 commit -m "edit a in foo1"
$ echo "hi" > foo/a && hg -R foo commit -m "edited a foo"
Pierre-Yves David
test: drop useless --update flag in issue1502 tests...
r28064 $ hg -R foo1 pull
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
r15447 pulling from $TESTTMP/foo (glob)
David Soria Parra
bookmarks: restrict moving a bookmark to its descendants (issue1502)...
r13478 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
Pierre-Yves David
test: drop useless --update flag in issue1502 tests...
r28064 (run 'hg heads' to see heads, 'hg merge' to merge)
David Soria Parra
bookmarks: restrict moving a bookmark to its descendants (issue1502)...
r13478
$ hg -R foo1 book branchy
$ hg -R foo1 book
* branchy 1:e3e522925eff
Pull. Bookmark should not jump to new head.
$ echo "there" >> foo/a && hg -R foo commit -m "edited a again"
$ hg -R foo1 pull
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
r15447 pulling from $TESTTMP/foo (glob)
David Soria Parra
bookmarks: restrict moving a bookmark to its descendants (issue1502)...
r13478 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
$ hg -R foo1 book
* branchy 1:e3e522925eff