Mercurial > hg-stable
annotate tests/test-mq-qsave.t @ 19523:f37b5a17e6a0 stable 2.7
bookmarks: pull --update updates to active bookmark if it moved (issue4007)
This makes `hg pull --update` behave the same wrt the active bookmark as
`hg pull && hg update` does as of 2096e025a728. A helper function,
bookmarks.calculateupdate, is added to prevent code duplication between
postincoming and update.
author | Kevin Bullock <kbullock@ringworld.org> |
---|---|
date | Thu, 01 Aug 2013 21:43:14 -0500 |
parents | b701610f6c56 |
children | 55c6ebd11cb9 |
rev | line source |
---|---|
12324
b701610f6c56
tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents:
2990
diff
changeset
|
1 $ echo "[extensions]" >> $HGRCPATH |
b701610f6c56
tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents:
2990
diff
changeset
|
2 $ echo "mq=" >> $HGRCPATH |
2817
ff3edd1c1e27
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
3 |
12324
b701610f6c56
tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents:
2990
diff
changeset
|
4 $ hg init |
2817
ff3edd1c1e27
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
5 |
12324
b701610f6c56
tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents:
2990
diff
changeset
|
6 $ echo 'base' > base |
b701610f6c56
tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents:
2990
diff
changeset
|
7 $ hg ci -Ambase |
b701610f6c56
tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents:
2990
diff
changeset
|
8 adding base |
2817
ff3edd1c1e27
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
9 |
12324
b701610f6c56
tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents:
2990
diff
changeset
|
10 $ hg qnew -mmqbase mqbase |
2817
ff3edd1c1e27
Add basic qsave/qrestore test.
Brendan Cully <brendan@kublai.com>
parents:
diff
changeset
|
11 |
12324
b701610f6c56
tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents:
2990
diff
changeset
|
12 $ hg qsave |
b701610f6c56
tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents:
2990
diff
changeset
|
13 $ hg qrestore 2 |
b701610f6c56
tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents:
2990
diff
changeset
|
14 restoring status: hg patches saved state |
b701610f6c56
tests: unify some of test-mq*
Adrian Buehlmann <adrian@cadifra.com>
parents:
2990
diff
changeset
|
15 |