equal
deleted
inserted
replaced
6 > qlog = log --template='{rev} - {node|short} {desc} ({state})\n' |
6 > qlog = log --template='{rev} - {node|short} {desc} ({state})\n' |
7 > [diff] |
7 > [diff] |
8 > git = 1 |
8 > git = 1 |
9 > unified = 0 |
9 > unified = 0 |
10 > [extensions] |
10 > [extensions] |
|
11 > hgext.rebase= |
11 > EOF |
12 > EOF |
12 $ echo "states=$(echo $(dirname $TESTDIR))/hgext/states.py" >> $HGRCPATH |
13 $ echo "states=$(echo $(dirname $TESTDIR))/hgext/states.py" >> $HGRCPATH |
13 $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH |
14 $ echo "obsolete=$(echo $(dirname $TESTDIR))/hgext/obsolete.py" >> $HGRCPATH |
14 $ echo "evolution=$(echo $(dirname $TESTDIR))/hgext/evolution.py" >> $HGRCPATH |
15 $ echo "evolution=$(echo $(dirname $TESTDIR))/hgext/evolution.py" >> $HGRCPATH |
15 $ mkcommit() { |
16 $ mkcommit() { |
188 |
189 |
189 $ hg log |
190 $ hg log |
190 4 feature-B: another feature - test |
191 4 feature-B: another feature - test |
191 1 feature-A: a nifty feature - test |
192 1 feature-A: a nifty feature - test |
192 0 : base - test |
193 0 : base - test |
|
194 |
|
195 $ hg up feature-A -q |
|
196 $ sed -i '' -e s/Eins/Un/ main-file-1 |
|
197 |
|
198 $ hg amend --note 'french looks better' |
|
199 $ hg log |
|
200 6 feature-A: a nifty feature - test |
|
201 4 feature-B: another feature - test |
|
202 1 : a nifty feature - test |
|
203 0 : base - test |
|
204 $ hg evolve |
|
205 hg rebase --dest 6 --source 4 --detach |
|
206 $ hg up feature-B -q #prevent feature-A bookmark to move grml |
|
207 $ hg rebase --dest 6 --source 4 --detach |
|
208 merging main-file-1 |
|
209 $ hg bookmark -fr 7 feature-B # XXX there is a bug out-there because we force --keep imp |
|
210 $ hg log |
|
211 7 feature-B: another feature - test |
|
212 6 feature-A: a nifty feature - test |
|
213 0 : base - test |