Peter Arrenbrecht avatar Peter Arrenbrecht committed c60030f

tut: adapt hg output to 2.4

Comments (0)

Files changed (10)

tut/src/pbranch/collab.rextile

 	$ echo 2 >>one
 	$ hg pnew p1
 	marked working directory as branch p1
+	(branches are permanent and global, did you want a bookmark?)
 
 Patch p2:
 
 	$ echo 3 >>one
 	$ hg pnew p2
 	marked working directory as branch p2
+	(branches are permanent and global, did you want a bookmark?)
 
 Yielding:
 
 	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 	p2: merging from p1
 	marked working directory as branch p2
+	(branches are permanent and global, did you want a bookmark?)
 	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 So p1 now contains an additional file @two@:
 	$ echo 4 >>one
 	$ hg pnew p3
 	marked working directory as branch p3
+	(branches are permanent and global, did you want a bookmark?)
 	created new head
 
 yielding:
 	$ hg pmerge --all
 	p3: merging from p1
 	marked working directory as branch p3
+	(branches are permanent and global, did you want a bookmark?)
 	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 	updating to p1
 	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 	p2: merging from p1
 	marked working directory as branch p2
+	(branches are permanent and global, did you want a bookmark?)
 	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Now, our collaborator does something similar:
 	$ hg pmerge --all
 	p3: merging from p1
 	marked working directory as branch p3
+	(branches are permanent and global, did you want a bookmark?)
 	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 	updating to p1
 	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 	p2: merging from p1
 	marked working directory as branch p2
+	(branches are permanent and global, did you want a bookmark?)
 	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 h3. Pull Conflicting Change
 	p1: merging from alternate head ea2bb5cf4441
 	merging conflict
 	warning: conflicts during merge.
-	merging conflict failed!
+	merging conflict incomplete! (edit conflicts, then use 'hg resolve --mark')
 	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 	abort: use 'hg resolve' to retry unresolved file merges, then do 'hg pmerge' again
 
 	$ hg pmerge --all
 	p3: merging from p1
 	marked working directory as branch p3
+	(branches are permanent and global, did you want a bookmark?)
 	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 	p3: merging from alternate head 5482c93964fa
 	merging .hgpatchinfo/p3.dep
 	warning: conflicts during merge.
-	merging .hgpatchinfo/p3.dep failed!
+	merging .hgpatchinfo/p3.dep incomplete! (edit conflicts, then use 'hg resolve --mark')
 	merging conflict
 	warning: conflicts during merge.
-	merging conflict failed!
+	merging conflict incomplete! (edit conflicts, then use 'hg resolve --mark')
 	0 files updated, 0 files merged, 0 files removed, 2 files unresolved
 	resolving conflict; already merged in rev 13
 	p3: resolving .hgpatchinfo/p3.dep

tut/src/pbranch/config.rextile

 To check the setup, run:
 
 	$ hg help pbranch
-	pbranch extension - manages evolving patches as topic branches (an alternative to mq)
+	pbranch extension - manages evolving patches as topic branches (an alternative
+	to mq)
 	_
 	This extension lets you develop patches collaboratively in special topic
 	branches of temporary clones of the main repository.
 	_
 	list of commands:
 	_
-	 pbackout       backs out the current patch branch (undoes all its changes)
-	 pdiff          prints the final diff for the current or given patch branch
-	 peditmessage   edit the patch message
-	 pemail         send patches by email
-	 pexport        exports patches
-	 pgraph         print an ASCII art rendering of the patch dependency graph
-	 pmerge         merge pending heads from dependencies into patch branches
-	 pmessage       print the patch message(s)
-	 pnew           start a new patch branch
-	 pstatus        print status of current (or given) patch branch
-	 reapply        reverts the working copy of all files touched by REV to REV
+	 pbackout      backs out the current patch branch (undoes all its changes)
+	 pdiff         prints the final diff for the current or given patch branch
+	 peditmessage  edit the patch message
+	 pemail        send patches by email
+	 pexport       exports patches
+	 pgraph        print an ASCII art rendering of the patch dependency graph
+	 pmerge        merge pending heads from dependencies into patch branches
+	 pmessage      print the patch message(s)
+	 pnew          start a new patch branch
+	 pstatus       print status of current (or given) patch branch
+	 reapply       reverts the working copy of all files touched by REV to REV
 	_
 	use "hg -v help pbranch" to show builtin aliases and global options
 

tut/src/pbranch/dist.rextile

 
 	$ hg pnew --preserve patchD
 	marked working directory as branch patchD
+	(branches are permanent and global, did you want a bookmark?)
 
 This preserves our changes in the working copy:
 
 	1 files updated, 0 files merged, 6 files removed, 0 files unresolved
 	patchB: merging from patchA
 	marked working directory as branch patchB
+	(branches are permanent and global, did you want a bookmark?)
 	merging main-file-1
 	3 files updated, 1 files merged, 0 files removed, 0 files unresolved
 	patchC: merging from patchB
 	marked working directory as branch patchC
+	(branches are permanent and global, did you want a bookmark?)
 	merging main-file-1
 	3 files updated, 1 files merged, 0 files removed, 0 files unresolved
 
 	1 files updated, 0 files merged, 6 files removed, 0 files unresolved
 	patchB: merging from patchA
 	marked working directory as branch patchB
+	(branches are permanent and global, did you want a bookmark?)
 	merging main-file-1
 	warning: conflicts during merge.
-	merging main-file-1 failed!
+	merging main-file-1 incomplete! (edit conflicts, then use 'hg resolve --mark')
 	3 files updated, 0 files merged, 0 files removed, 1 files unresolved
 	abort: use 'hg resolve' to handle unresolved file merges, then do 'hg pmerge' again
 
 	2 files updated, 0 files merged, 3 files removed, 0 files unresolved
 	patchC: merging from patchB
 	marked working directory as branch patchC
+	(branches are permanent and global, did you want a bookmark?)
 	merging main-file-1
 	warning: conflicts during merge.
-	merging main-file-1 failed!
+	merging main-file-1 incomplete! (edit conflicts, then use 'hg resolve --mark')
 	3 files updated, 0 files merged, 0 files removed, 1 files unresolved
 	abort: use 'hg resolve' to handle unresolved file merges, then do 'hg pmerge' again
 

tut/src/pbranch/email.rextile

 h5. hg pemail
 
 	$ hg pemail --test --from john@example.com --to jane@example.com patchA
-	This patch series consists of 1 patches.
+	this patch series consists of 1 patches.
 	_
 	Cc:
 	_
-	Displaying [PATCH] a nifty patch ...
+	displaying [PATCH] a nifty patch ...
 	Content-Type: text/plain; charset="us-ascii"
 	MIME-Version: 1.0
 	Content-Transfer-Encoding: 7bit
 h5. hg pemail --with-deps
 
 	$ hg pemail $(cat mailopts) --with-deps patchB
-	This patch series consists of 2 patches.
+	this patch series consists of 2 patches.
 	_
 	Cc:
 	_
-	Displaying [PATCH 0 of 2] "Intro" ...
+	displaying [PATCH 0 of 2] "Intro" ...
 	Content-Type: text/plain; charset="us-ascii"
 	MIME-Version: 1.0
 	Content-Transfer-Encoding: 7bit
 	_
 	This is the patch series description.
 	_
-	Displaying [PATCH 1 of 2] a nifty patch ...
+	displaying [PATCH 1 of 2] a nifty patch ...
 	Content-Type: text/plain; charset="us-ascii"
 	MIME-Version: 1.0
 	Content-Transfer-Encoding: 7bit
 	@@ -1,1 +1,1 @@
 	-One
 	+Eins
-	Displaying [PATCH 2 of 2] another patch ...
+	displaying [PATCH 2 of 2] another patch ...
 	Content-Type: text/plain; charset="us-ascii"
 	MIME-Version: 1.0
 	Content-Transfer-Encoding: 7bit
 Finally, we can send multiple patches in arbitrary order by naming them all explicitly:
 
 	$ hg pemail $(cat mailopts) patchA patchB patchC
-	This patch series consists of 3 patches.
+	this patch series consists of 3 patches.
 	_
 	Cc:
 	_
-	Displaying [PATCH 0 of 3] "Intro" ...
+	displaying [PATCH 0 of 3] "Intro" ...
 	Content-Type: text/plain; charset="us-ascii"
 	MIME-Version: 1.0
 	Content-Transfer-Encoding: 7bit
 	_
 	This is the patch series description.
 	_
-	Displaying [PATCH 1 of 3] a nifty patch ...
+	displaying [PATCH 1 of 3] a nifty patch ...
 	Content-Type: text/plain; charset="us-ascii"
 	MIME-Version: 1.0
 	Content-Transfer-Encoding: 7bit
 	@@ -1,1 +1,1 @@
 	-One
 	+Eins
-	Displaying [PATCH 2 of 3] another patch ...
+	displaying [PATCH 2 of 3] another patch ...
 	Content-Type: text/plain; charset="us-ascii"
 	MIME-Version: 1.0
 	Content-Transfer-Encoding: 7bit
 	@@ -3,1 +3,1 @@
 	-Two
 	+Zwei
-	Displaying [PATCH 3 of 3] yet another patch ...
+	displaying [PATCH 3 of 3] yet another patch ...
 	Content-Type: text/plain; charset="us-ascii"
 	MIME-Version: 1.0
 	Content-Transfer-Encoding: 7bit

tut/src/pbranch/graph.rextile

 	$ hg add p_root
 	$ hg pnew p_root
 	marked working directory as branch p_root
+	(branches are permanent and global, did you want a bookmark?)
 
 	$ echo a >p_fork1
 	$ hg add p_fork1
 	$ hg pnew p_fork1
 	marked working directory as branch p_fork1
+	(branches are permanent and global, did you want a bookmark?)
 
 	$ echo a >p_join
 	$ hg add p_join
 	$ hg pnew p_join
 	marked working directory as branch p_join
+	(branches are permanent and global, did you want a bookmark?)
 
 This is linear so far:
 
 	$ hg add p_fork2
 	$ hg pnew p_fork2
 	marked working directory as branch p_fork2
+	(branches are permanent and global, did you want a bookmark?)
 	created new head
 
 So we have:
 	updating to p_fork1
 	2 files updated, 0 files merged, 2 files removed, 0 files unresolved
 	marked working directory as branch .p_join
+	(branches are permanent and global, did you want a bookmark?)
 	created new head
 	updating to p_fork2
 	2 files updated, 0 files merged, 3 files removed, 0 files unresolved
 	.p_join: merging from p_fork2
 	marked working directory as branch .p_join
+	(branches are permanent and global, did you want a bookmark?)
 	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 	p_join: merging from .p_join
 	marked working directory as branch p_join
+	(branches are permanent and global, did you want a bookmark?)
 	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 And the patch diff now properly shows only the file introduced by @p_join@:
 	1 files updated, 0 files merged, 5 files removed, 0 files unresolved
 	.p_join: merging from p_fork1
 	marked working directory as branch .p_join
+	(branches are permanent and global, did you want a bookmark?)
 	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 	p_join: merging from .p_join
 	marked working directory as branch p_join
+	(branches are permanent and global, did you want a bookmark?)
 	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Looking at the merge graph, we sure are glad we don't have to run all these merges correctly by hand:
 	1 files updated, 0 files merged, 5 files removed, 0 files unresolved
 	.p_join: merging from p_fork1
 	marked working directory as branch .p_join
+	(branches are permanent and global, did you want a bookmark?)
 	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 	updating to p_fork2
 	1 files updated, 0 files merged, 3 files removed, 0 files unresolved
 	.p_join: merging from p_fork2
 	marked working directory as branch .p_join
+	(branches are permanent and global, did you want a bookmark?)
 	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 	p_join: merging from .p_join
 	marked working directory as branch p_join
+	(branches are permanent and global, did you want a bookmark?)
 	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 	$ hg pdiff | diffstat

tut/src/pbranch/insert.rextile

 	$ hg add b1
 	$ hg pnew --text "inserted patch" patchB1
 	marked working directory as branch patchB1
+	(branches are permanent and global, did you want a bookmark?)
 	created new head
 
 Now we update the dependency info for patchC:
 	4 files updated, 0 files merged, 3 files removed, 0 files unresolved
 	patchC: merging from patchB1
 	marked working directory as branch patchC
+	(branches are permanent and global, did you want a bookmark?)
 	4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 	$ hg clone . ../delete

tut/src/pbranch/octopus.rextile

 
 	$ hg branch A
 	marked working directory as branch A
+	(branches are permanent and global, did you want a bookmark?)
 	$ echo a >a
 	$ echo b >b
 	$ echo c >c
 	$ echo B >b
 	$ hg pnew B
 	marked working directory as branch B
+	(branches are permanent and global, did you want a bookmark?)
 
 Fork A -> C -> D:
 
 	$ echo C >c
 	$ hg pnew C
 	marked working directory as branch C
+	(branches are permanent and global, did you want a bookmark?)
 	created new head
 
 	$ echo D >d
 	$ hg pnew D
 	marked working directory as branch D
+	(branches are permanent and global, did you want a bookmark?)
 
 Fork A -> E:
 
 	$ echo E >e
 	$ hg pnew E
 	marked working directory as branch E
+	(branches are permanent and global, did you want a bookmark?)
 	created new head
 
 Join (B, D, E) -> O:
 
 	$ hg pnew O
 	marked working directory as branch O
+	(branches are permanent and global, did you want a bookmark?)
 	$ sed -i .hg/pgraph -e 's/O: E/O: B, D, E/'
 	$ hg pmerge
 	updating to B
 	3 files updated, 0 files merged, 2 files removed, 0 files unresolved
 	marked working directory as branch .O
+	(branches are permanent and global, did you want a bookmark?)
 	updating to D
 	5 files updated, 0 files merged, 2 files removed, 0 files unresolved
 	.O: merging from D
 	marked working directory as branch .O
+	(branches are permanent and global, did you want a bookmark?)
 	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 	updating to E
 	5 files updated, 0 files merged, 4 files removed, 0 files unresolved
 	.O: merging from E
 	marked working directory as branch .O
+	(branches are permanent and global, did you want a bookmark?)
 	7 files updated, 0 files merged, 0 files removed, 0 files unresolved
 	O: merging from .O
 	marked working directory as branch O
+	(branches are permanent and global, did you want a bookmark?)
 	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Result:
 	3 files updated, 0 files merged, 1 files removed, 0 files unresolved
 	B: merging from A
 	marked working directory as branch B
+	(branches are permanent and global, did you want a bookmark?)
 	merging b
 	warning: conflicts during merge.
-	merging b failed!
+	merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
 	1 files updated, 0 files merged, 0 files removed, 1 files unresolved
 	abort: use 'hg resolve' to handle unresolved file merges, then do 'hg pmerge' again
 	$ echo B1 >b
 	4 files updated, 0 files merged, 2 files removed, 0 files unresolved
 	C: merging from A
 	marked working directory as branch C
+	(branches are permanent and global, did you want a bookmark?)
 	merging c
 	warning: conflicts during merge.
-	merging c failed!
+	merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
 	1 files updated, 0 files merged, 0 files removed, 1 files unresolved
 	abort: use 'hg resolve' to handle unresolved file merges, then do 'hg pmerge' again
 	$ echo C1 >c
 	C: updating dependencies
 	D: merging from C
 	marked working directory as branch D
+	(branches are permanent and global, did you want a bookmark?)
 	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 And A -> E:
 	3 files updated, 0 files merged, 1 files removed, 0 files unresolved
 	E: merging from A
 	marked working directory as branch E
+	(branches are permanent and global, did you want a bookmark?)
 	merging e
 	warning: conflicts during merge.
-	merging e failed!
+	merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
 	1 files updated, 0 files merged, 0 files removed, 1 files unresolved
 	abort: use 'hg resolve' to handle unresolved file merges, then do 'hg pmerge' again
 	$ echo E1 >e
 	3 files updated, 0 files merged, 1 files removed, 0 files unresolved
 	.O: merging from B
 	marked working directory as branch .O
+	(branches are permanent and global, did you want a bookmark?)
 	merging c
 	warning: conflicts during merge.
-	merging c failed!
+	merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
 	merging e
 	warning: conflicts during merge.
-	merging e failed!
+	merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
 	5 files updated, 0 files merged, 0 files removed, 2 files unresolved
 	deferring c; pending resolution in rev 13
 	deferring e; pending resolution in rev 16
 
 	$ hg branch A
 	marked working directory as branch A
+	(branches are permanent and global, did you want a bookmark?)
 	$ echo a >a
 	$ for i in 1 2 3 4 5 6 7 8 9; do echo $i >>a; done
 	$ echo b >b
 	$ echo B >b
 	$ hg pnew B
 	marked working directory as branch B
+	(branches are permanent and global, did you want a bookmark?)
 
 Fork A -> C -> D, changes file _a_ in D in a different hunk:
 
 	$ echo C >c
 	$ hg pnew C
 	marked working directory as branch C
+	(branches are permanent and global, did you want a bookmark?)
 	created new head
 
 	$ sed -i a -e s/8/D/
 	$ echo D >d
 	$ hg pnew D
 	marked working directory as branch D
+	(branches are permanent and global, did you want a bookmark?)
 
 Fork A -> E:
 
 	$ echo E >e
 	$ hg pnew E
 	marked working directory as branch E
+	(branches are permanent and global, did you want a bookmark?)
 	created new head
 
 Join (B, D, E) -> O:
 
 	$ hg pnew O
 	marked working directory as branch O
+	(branches are permanent and global, did you want a bookmark?)
 	$ sed -i .hg/pgraph -e 's/O: E/O: B, D, E/'
 	$ hg pmerge
 	updating to B
 	4 files updated, 0 files merged, 2 files removed, 0 files unresolved
 	marked working directory as branch .O
+	(branches are permanent and global, did you want a bookmark?)
 	updating to D
 	6 files updated, 0 files merged, 2 files removed, 0 files unresolved
 	.O: merging from D
 	marked working directory as branch .O
+	(branches are permanent and global, did you want a bookmark?)
 	merging a
 	3 files updated, 1 files merged, 0 files removed, 0 files unresolved
 	updating to E
 	6 files updated, 0 files merged, 4 files removed, 0 files unresolved
 	.O: merging from E
 	marked working directory as branch .O
+	(branches are permanent and global, did you want a bookmark?)
 	8 files updated, 0 files merged, 0 files removed, 0 files unresolved
 	O: merging from .O
 	marked working directory as branch O
+	(branches are permanent and global, did you want a bookmark?)
 	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 Result:
 	4 files updated, 0 files merged, 1 files removed, 0 files unresolved
 	B: merging from A
 	marked working directory as branch B
+	(branches are permanent and global, did you want a bookmark?)
 	merging a
 	warning: conflicts during merge.
-	merging a failed!
+	merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
 	merging b
 	warning: conflicts during merge.
-	merging b failed!
+	merging b incomplete! (edit conflicts, then use 'hg resolve --mark')
 	1 files updated, 0 files merged, 0 files removed, 2 files unresolved
 	abort: use 'hg resolve' to handle unresolved file merges, then do 'hg pmerge' again
 	$ cp a.orig a
 	5 files updated, 0 files merged, 2 files removed, 0 files unresolved
 	C: merging from A
 	marked working directory as branch C
+	(branches are permanent and global, did you want a bookmark?)
 	merging c
 	warning: conflicts during merge.
-	merging c failed!
+	merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
 	1 files updated, 0 files merged, 0 files removed, 1 files unresolved
 	abort: use 'hg resolve' to handle unresolved file merges, then do 'hg pmerge' again
 	$ echo C1 >c
 	C: updating dependencies
 	D: merging from C
 	marked working directory as branch D
+	(branches are permanent and global, did you want a bookmark?)
 	merging a
 	warning: conflicts during merge.
-	merging a failed!
+	merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
 	2 files updated, 0 files merged, 0 files removed, 1 files unresolved
 	abort: use 'hg resolve' to handle unresolved file merges, then do 'hg pmerge' again
 	$ cp a.orig a
 	4 files updated, 0 files merged, 1 files removed, 0 files unresolved
 	E: merging from A
 	marked working directory as branch E
+	(branches are permanent and global, did you want a bookmark?)
 	merging e
 	warning: conflicts during merge.
-	merging e failed!
+	merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
 	1 files updated, 0 files merged, 0 files removed, 1 files unresolved
 	abort: use 'hg resolve' to handle unresolved file merges, then do 'hg pmerge' again
 	$ echo E1 >e
 	$ hg merge B
 	merging a
 	warning: conflicts during merge.
-	merging a failed!
+	merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
 	merging c
 	warning: conflicts during merge.
-	merging c failed!
+	merging c incomplete! (edit conflicts, then use 'hg resolve --mark')
 	merging e
 	warning: conflicts during merge.
-	merging e failed!
+	merging e incomplete! (edit conflicts, then use 'hg resolve --mark')
 	2 files updated, 0 files merged, 0 files removed, 3 files unresolved
 	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
 	$ hg debugoctopusresolve D E

tut/src/pbranch/pullupstream.rextile

 	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 	p_root: merging from default
 	marked working directory as branch p_root
+	(branches are permanent and global, did you want a bookmark?)
 	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 	p_fork1: merging from p_root
 	marked working directory as branch p_fork1
+	(branches are permanent and global, did you want a bookmark?)
 	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 	updating to p_root
 	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 	p_fork2: merging from p_root
 	marked working directory as branch p_fork2
+	(branches are permanent and global, did you want a bookmark?)
 	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 	created new head
 	.p_join: merging from p_fork2
 	marked working directory as branch .p_join
+	(branches are permanent and global, did you want a bookmark?)
 	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 	updating to p_fork1
 	1 files updated, 0 files merged, 3 files removed, 0 files unresolved
 	.p_join: merging from p_fork1
 	marked working directory as branch .p_join
+	(branches are permanent and global, did you want a bookmark?)
 	merging .hgpatchinfo/p_fork1.dep
 	3 files updated, 1 files merged, 0 files removed, 0 files unresolved
 	p_join: merging from .p_join
 	marked working directory as branch p_join
+	(branches are permanent and global, did you want a bookmark?)
 	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 

tut/src/pbranch/sanity.rextile

 
 	$ hg pnew one
 	marked working directory as branch one
+	(branches are permanent and global, did you want a bookmark?)
 	$ hg pgraph -tns
 	@  [one]
 	|
 
 	$ hg pnew two
 	marked working directory as branch two
+	(branches are permanent and global, did you want a bookmark?)
 	$ hg up one
 	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 	$ echo a >a
 
 	$ hg pnew one
 	marked working directory as branch one
+	(branches are permanent and global, did you want a bookmark?)
 	$ hg pnew two
 	marked working directory as branch two
+	(branches are permanent and global, did you want a bookmark?)
 
 	$ hg peditmessage two -t "zwei"
 	$ hg peditmessage one -t "eins"
 
 	$ hg pnew one
 	marked working directory as branch one
+	(branches are permanent and global, did you want a bookmark?)
 
 	$ hg peditmessage -t "eins" -m "updated desc"
 

tut/src/pbranch/simple.rextile

 
 	$ hg pnew patchA
 	marked working directory as branch patchA
+	(branches are permanent and global, did you want a bookmark?)
 
 This commits the patch to a new patch branch called @patchA@:
 
 
 	$ hg pnew --text "another patch" patchB
 	marked working directory as branch patchB
+	(branches are permanent and global, did you want a bookmark?)
 
 
 h3. Fix The Second Patch
 
 	$ hg branch patchC
 	marked working directory as branch patchC
+	(branches are permanent and global, did you want a bookmark?)
 	$ hg commit --message "changes for C"
 
 If we try to get the patch now, we get an error:
 	2 files updated, 0 files merged, 6 files removed, 0 files unresolved
 	patchB: merging from patchA
 	marked working directory as branch patchB
+	(branches are permanent and global, did you want a bookmark?)
 	4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 	patchC: merging from patchB
 	marked working directory as branch patchC
+	(branches are permanent and global, did you want a bookmark?)
 	4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 	$ hg glog
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.