Commits

Anonymous committed e0b56f0

Fix sample output for 'backout' test.

Comments (0)

Files changed (6)

en/examples/backout.manual.backout.out

 $ \textbf{hg commit -m 'third change'}
 $ \textbf{hg backout -m 'back out second change' 1}
 reverting myfile
+created new head
 changeset  backs out changeset 
 the backout changeset is a new head - do not forget to merge
 (use "backout --merge" if you want to auto-merge)

en/examples/backout.manual.cat.out

 $ \textbf{cat myfile}
 first change
+second change
+third change

en/examples/backout.manual.clone.out

 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ \textbf{cd newrepo}

en/examples/backout.manual.parents.out

 $ \textbf{hg parents}
 changeset:   
-tag:         tip
-parent:      
 user:        Bryan O'Sullivan <bos@serpentine.com>
 
-summary:     back out second change
+summary:     third change
 

en/examples/backout.non-tip.backout.out

 $ \textbf{hg commit -m 'third change'}
 $ \textbf{hg backout --merge -m 'back out second change' 1}
 reverting myfile
+created new head
 changeset  backs out changeset 
 merging with changeset 
 merging myfile

en/examples/backout.non-tip.clone.out

 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 $ \textbf{cd non-tip-repo}