##// END OF EJS Templates
rebase: demonstrate behavior with requiredest and pull --rebase
Ryan McElroy -
r31732:9ddf8751 default
parent child Browse files
Show More
@@ -57,3 +57,28 b' Requiring dest should not break continue'
57 $ hg rebase --continue
57 $ hg rebase --continue
58 rebasing 3:0537f6b50def "dc" (tip)
58 rebasing 3:0537f6b50def "dc" (tip)
59 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-backup.hg (glob)
59 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/0537f6b50def-be4c7386-backup.hg (glob)
60
61 $ cd ..
62
63 Check rebase.requiredest interaction with pull --rebase
64 $ hg clone repo clone
65 updating to branch default
66 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
67 $ cd repo
68 $ echo e > e
69 $ hg commit -qAm ee
70 $ cd ..
71 $ cd clone
72 $ echo f > f
73 $ hg commit -qAm ff
74 $ hg pull --rebase
75 pulling from $TESTTMP/repo
76 searching for changes
77 adding changesets
78 adding manifests
79 adding file changes
80 added 1 changesets with 2 changes to 2 files (+1 heads)
81 abort: you must specify a destination
82 (use: hg rebase -d REV)
83 [255]
84
General Comments 0
You need to be logged in to leave comments. Login now