hgbook
changeset 549:bc14f94e726a
Check in a known-broken example to fix up later - XXX
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu Jan 29 22:47:34 2009 -0800 (2009-01-29) |
parents | 5ffee9123bbf |
children | 5cd47f721686 |
files | en/examples/tour-merge-conflict en/examples/tour-merge-conflict.commit.out en/examples/tour-merge-conflict.merge.out |
line diff
1.1 --- a/en/examples/tour-merge-conflict Thu Jan 29 22:46:56 2009 -0800 1.2 +++ b/en/examples/tour-merge-conflict Thu Jan 29 22:47:34 2009 -0800 1.3 @@ -56,6 +56,7 @@ 1.4 #$ ignore: [<>]{7} /tmp/.* 1.5 1.6 export HGMERGE=merge 1.7 +echo 'XXX this is broken and must be fixed' 1.8 hg merge 1.9 cat letter.txt 1.10
2.1 --- a/en/examples/tour-merge-conflict.commit.out Thu Jan 29 22:46:56 2009 -0800 2.2 +++ b/en/examples/tour-merge-conflict.commit.out Thu Jan 29 22:47:34 2009 -0800 2.3 @@ -4,29 +4,6 @@ 2.4 > \textbf{Nigerian dictator Sani Abacha.} 2.5 > \textbf{EOF} 2.6 $ \textbf{hg resolve -m letter.txt} 2.7 -hg: unknown command 'resolve' 2.8 -Mercurial Distributed SCM 2.9 - 2.10 -basic commands: 2.11 - 2.12 - add add the specified files on the next commit 2.13 - annotate show changeset information per file line 2.14 - clone make a copy of an existing repository 2.15 - commit commit the specified files or all outstanding changes 2.16 - diff diff repository (or selected files) 2.17 - export dump the header and diffs for one or more changesets 2.18 - init create a new repository in the given directory 2.19 - log show revision history of entire repository or files 2.20 - merge merge working directory with another revision 2.21 - parents show the parents of the working dir or revision 2.22 - pull pull changes from the specified source 2.23 - push push changes to the specified destination 2.24 - remove remove the specified files on the next commit 2.25 - serve export the repository via HTTP 2.26 - status show changed files in the working directory 2.27 - update update working directory 2.28 - 2.29 -use "hg help" for the full list of commands or "hg -v" for details 2.30 $ \textbf{hg commit -m 'Send me your money'} 2.31 $ \textbf{hg tip} 2.32 changeset:
3.1 --- a/en/examples/tour-merge-conflict.merge.out Thu Jan 29 22:46:56 2009 -0800 3.2 +++ b/en/examples/tour-merge-conflict.merge.out Thu Jan 29 22:47:34 2009 -0800 3.3 @@ -1,12 +1,12 @@ 3.4 $ \textbf{export HGMERGE=merge} 3.5 +$ \textbf{echo 'XXX this is broken and must be fixed'} 3.6 +XXX this is broken and must be fixed 3.7 $ \textbf{hg merge} 3.8 merging letter.txt 3.9 merge: warning: conflicts during merge 3.10 merging letter.txt failed! 3.11 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 3.12 -There are unresolved merges, you can redo the full merge using: 3.13 - hg update -C 1 3.14 - hg merge 2 3.15 +use 'hg resolve' to retry unresolved file merges 3.16 $ \textbf{cat letter.txt} 3.17 Greetings! 3.18