Mercurial > hg
annotate tests/test-pull-update.t @ 12664:545ec1775021
merge: handle no file parent in backwards merge (issue2364)
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 09 Oct 2010 14:50:20 -0500 |
| parents | 28e2e3804f2e |
| children | 610873cf064a |
| rev | line source |
|---|---|
| 12279 | 1 $ hg init t |
| 2 $ cd t | |
| 3 $ echo 1 > foo | |
| 4 $ hg ci -Am m | |
| 5 adding foo | |
| 6 | |
| 7 $ cd .. | |
| 8 $ hg clone t tt | |
| 9 updating to branch default | |
| 10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 11 $ cd tt | |
| 12 $ echo 1.1 > foo | |
| 13 $ hg ci -Am m | |
|
5080
73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
14 |
| 12279 | 15 $ cd ../t |
| 16 $ echo 1.2 > foo | |
| 17 $ hg ci -Am m | |
| 18 | |
| 19 Should not update: | |
|
5080
73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
20 |
| 12279 | 21 $ hg pull -u ../tt |
| 22 pulling from ../tt | |
| 23 searching for changes | |
| 24 adding changesets | |
| 25 adding manifests | |
| 26 adding file changes | |
| 27 added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 28 not updating, since new heads added | |
| 29 (run 'hg heads' to see heads, 'hg merge' to merge) | |
| 30 | |
| 31 $ cd ../tt | |
|
5080
73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
32 |
| 12279 | 33 Should not update: |
| 34 | |
| 35 $ hg pull -u ../t | |
| 36 pulling from ../t | |
| 37 searching for changes | |
| 38 adding changesets | |
| 39 adding manifests | |
| 40 adding file changes | |
| 41 added 1 changesets with 1 changes to 1 files (+1 heads) | |
| 42 not updating, since new heads added | |
| 43 (run 'hg heads' to see heads, 'hg merge' to merge) | |
|
5080
73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
44 |
| 12279 | 45 $ HGMERGE=true hg merge |
| 46 merging foo | |
| 47 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 48 (branch merge, don't forget to commit) | |
| 49 $ hg ci -mm | |
| 50 | |
| 51 $ cd ../t | |
| 52 | |
| 53 Should work: | |
|
5080
73fdc8bd3ed8
Update on pull -u when heads were closed (fixes issue666).
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
54 |
| 12279 | 55 $ hg pull -u ../tt |
| 56 pulling from ../tt | |
| 57 searching for changes | |
| 58 adding changesets | |
| 59 adding manifests | |
| 60 adding file changes | |
| 61 added 1 changesets with 1 changes to 1 files (-1 heads) | |
| 62 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 63 |