Mercurial > hg
diff tests/test-pull-r.t @ 14036:90d997a812dc
changegroup: do not count closed new heads (issue2697)
If a closed head gets pulled, we currently see (example):
$ hg pull
pulling from $TESTTMP/repo2
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
A subsequent 'hg heads' doesn't show that head because it is closed.
This patch improves the UI response texts for that same use case to:
$ hg pull
pulling from $TESTTMP/repo2
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
That is, the part "(+1 heads)" is not shown in that case any longer.
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Sun, 24 Apr 2011 20:11:05 +0200 |
parents | 1e497df514e2 |
children | 301725c3df9a |
line wrap: on
line diff
--- a/tests/test-pull-r.t Fri Apr 29 20:02:46 2011 +0200 +++ b/tests/test-pull-r.t Sun Apr 24 20:11:05 2011 +0200 @@ -27,6 +27,36 @@ summary: add foo $ cd .. + +don't show "(+1 heads)" message when pulling closed head + + $ hg clone -q repo repo2 + $ hg clone -q repo2 repo3 + $ cd repo2 + $ hg up -q 0 + $ echo hello >> foo + $ hg ci -mx1 + created new head + $ hg ci -mx2 --close-branch + $ cd ../repo3 + $ hg heads -q --closed + 2:effea6de0384 + 1:ed1b79f46b9a + $ hg pull + pulling from $TESTTMP/repo2 + searching for changes + adding changesets + adding manifests + adding file changes + added 2 changesets with 1 changes to 1 files + (run 'hg update' to get a working copy) + $ hg heads -q --closed + 4:996201fa1abf + 2:effea6de0384 + 1:ed1b79f46b9a + + $ cd .. + $ hg init copy $ cd copy