comparison 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
comparison
equal deleted inserted replaced
14035:865c30d54c30 14036:90d997a812dc
25 user: test 25 user: test
26 date: Thu Jan 01 00:00:00 1970 +0000 26 date: Thu Jan 01 00:00:00 1970 +0000
27 summary: add foo 27 summary: add foo
28 28
29 $ cd .. 29 $ cd ..
30
31 don't show "(+1 heads)" message when pulling closed head
32
33 $ hg clone -q repo repo2
34 $ hg clone -q repo2 repo3
35 $ cd repo2
36 $ hg up -q 0
37 $ echo hello >> foo
38 $ hg ci -mx1
39 created new head
40 $ hg ci -mx2 --close-branch
41 $ cd ../repo3
42 $ hg heads -q --closed
43 2:effea6de0384
44 1:ed1b79f46b9a
45 $ hg pull
46 pulling from $TESTTMP/repo2
47 searching for changes
48 adding changesets
49 adding manifests
50 adding file changes
51 added 2 changesets with 1 changes to 1 files
52 (run 'hg update' to get a working copy)
53 $ hg heads -q --closed
54 4:996201fa1abf
55 2:effea6de0384
56 1:ed1b79f46b9a
57
58 $ cd ..
59
30 $ hg init copy 60 $ hg init copy
31 $ cd copy 61 $ cd copy
32 62
33 Pull a missing revision: 63 Pull a missing revision:
34 64