##// END OF EJS Templates
Merge with stable
Martin Geisler -
r11517:8bbe3968 merge default
parent child Browse files
Show More
@@ -803,7 +803,7 b' def commit(ui, repo, *pats, **opts):'
803
803
804 if not opts.get('close_branch'):
804 if not opts.get('close_branch'):
805 for r in parents:
805 for r in parents:
806 if r.extra().get('close'):
806 if r.extra().get('close') and r.branch() == branch:
807 ui.status(_('reopening closed branch head %d\n') % r)
807 ui.status(_('reopening closed branch head %d\n') % r)
808
808
809 if ui.debugflag:
809 if ui.debugflag:
@@ -48,4 +48,26 b' hg up -C good'
48 hg merge
48 hg merge
49 hgcommit -m 'merged heads'
49 hgcommit -m 'merged heads'
50
50
51 echo '% hg update -C 8'
52 hg update -C 8
51
53
54 echo '% hg branch some-branch'
55 hg branch some-branch
56 echo '% hg commit'
57 hgcommit -m 'started some-branch'
58 echo '% hg commit --close-branch'
59 hgcommit --close-branch -m 'closed some-branch'
60
61 echo '% hg update default'
62 hg update default
63 echo '% hg merge some-branch'
64 hg merge some-branch
65 echo '% hg commit (no reopening of some-branch)'
66 hgcommit -m 'merge with closed branch'
67
68 cat >> $HGRCPATH <<EOF
69 [extensions]
70 graphlog =
71 EOF
72
73 #hg glog
@@ -16,3 +16,15 b' 1 files updated, 0 files merged, 1 files'
16 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
16 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
17 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
17 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
18 (branch merge, don't forget to commit)
18 (branch merge, don't forget to commit)
19 % hg update -C 8
20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
21 % hg branch some-branch
22 marked working directory as branch some-branch
23 % hg commit
24 % hg commit --close-branch
25 % hg update default
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
27 % hg merge some-branch
28 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
29 (branch merge, don't forget to commit)
30 % hg commit (no reopening of some-branch)
General Comments 0
You need to be logged in to leave comments. Login now