view tests/test-hgcia.out @ 9717:68a1b9d0663e

update: allow branch crossing without -c or -C, with no uncommitted changes Update will now allow crossing branches within the same named branch, when given a specific revision, if the working dir is clean, without requiring the -c or -C option. Abort if no revision is given and this would cross branches. Minor change to abort message if uncommitted changes are found. Modify test-update-branches and output to reflect the altered case. Modify test-merge5.out to reflect the altered case. Modify test-up-local-change.out with new message.
author Stuart W Marks <smarks@smarks.org>
date Thu, 05 Nov 2009 10:53:59 +0100
parents b80b944836ec
children
line wrap: on
line source

adding foo
pushing to ../cia
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files

<message>
  <generator>
    <name>Mercurial (hgcia)</name>
    <version>0.1</version>
    <url>http://hg.kublai.com/mercurial/hgcia</url>
    <user>testuser</user>
  </generator>
  <source>
<project>testproject</project>
<branch>default</branch>
</source>
  <body>
    <commit>
      <author>test</author>
      <version>0:e63c23eaa88a</version>
      <log>foo</log>
      
      <files><file action="add">foo</file></files>
    </commit>
  </body>
  <timestamp>0</timestamp>
</message>