equal
deleted
inserted
replaced
108 |
108 |
109 $ hg graft -r 1 2 |
109 $ hg graft -r 1 2 |
110 warning: inconsistent use of --rev might give unexpected revision ordering! |
110 warning: inconsistent use of --rev might give unexpected revision ordering! |
111 skipping ancestor revision 2:5c095ad7e90f |
111 skipping ancestor revision 2:5c095ad7e90f |
112 skipping ancestor revision 1:5d205f8b35b6 |
112 skipping ancestor revision 1:5d205f8b35b6 |
|
113 [255] |
|
114 |
|
115 Conflicting date/user options: |
|
116 |
|
117 $ hg up -q 0 |
|
118 $ hg graft -U --user foo 2 |
|
119 abort: --user and --currentuser are mutually exclusive |
|
120 [255] |
|
121 $ hg graft -D --date '0 0' 2 |
|
122 abort: --date and --currentdate are mutually exclusive |
113 [255] |
123 [255] |
114 |
124 |
115 Can't graft with dirty wd: |
125 Can't graft with dirty wd: |
116 |
126 |
117 $ hg up -q 0 |
127 $ hg up -q 0 |