Show More
@@ -2989,7 +2989,10 b' def postincoming(ui, repo, modheads, opt' | |||||
2989 | else: |
|
2989 | else: | |
2990 | ui.status(_("not updating, since new heads added\n")) |
|
2990 | ui.status(_("not updating, since new heads added\n")) | |
2991 | if modheads > 1: |
|
2991 | if modheads > 1: | |
2992 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) |
|
2992 | if (len(repo.branchheads()) > 1): | |
|
2993 | ui.status(_("(run 'hg heads' to see heads, 'hg merge' to merge)\n")) | |||
|
2994 | else: | |||
|
2995 | ui.status(_("(run 'hg heads' to see heads)\n")) | |||
2993 | else: |
|
2996 | else: | |
2994 | ui.status(_("(run 'hg update' to get a working copy)\n")) |
|
2997 | ui.status(_("(run 'hg update' to get a working copy)\n")) | |
2995 |
|
2998 |
@@ -134,3 +134,30 b' Should succeed because there is only one' | |||||
134 | not updating, since new heads added |
|
134 | not updating, since new heads added | |
135 | (run 'hg heads' to see heads, 'hg merge' to merge) |
|
135 | (run 'hg heads' to see heads, 'hg merge' to merge) | |
136 |
|
136 | |||
|
137 | Make changes on new branch on tt | |||
|
138 | ||||
|
139 | $ hg branch branchC | |||
|
140 | marked working directory as branch branchC | |||
|
141 | $ echo b1 > bar | |||
|
142 | $ hg ci -Am "commit on branchC" | |||
|
143 | adding bar | |||
|
144 | ||||
|
145 | Make changes on default branch on t | |||
|
146 | ||||
|
147 | $ cd ../t | |||
|
148 | $ hg up -C default | |||
|
149 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
150 | $ echo a1 > bar | |||
|
151 | $ hg ci -Am "commit on default" | |||
|
152 | adding bar | |||
|
153 | ||||
|
154 | Pull branchC from tt | |||
|
155 | ||||
|
156 | $ hg pull ../tt | |||
|
157 | pulling from ../tt | |||
|
158 | searching for changes | |||
|
159 | adding changesets | |||
|
160 | adding manifests | |||
|
161 | adding file changes | |||
|
162 | added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
163 | (run 'hg heads' to see heads) |
General Comments 0
You need to be logged in to leave comments.
Login now