view tests/test-merge5.out @ 610:4c02464cb9f0

check export options for changeset before running # HG changeset patch # User shaleh@speakeasy.net # Node ID 0cc64f4312540b2081c76dc589cc825d734676d8 # Parent f7bfe827ea381afc89f486b2d93d7f4fe86de04d check export options for changeset before running diff -r f7bfe827ea38 -r 0cc64f431254 mercurial/commands.py
author shaleh@speakeasy.net
date Mon, 04 Jul 2005 11:06:01 -0800
parents c2b9502a4e96
children d45d1c90032e
line wrap: on
line source

+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ echo This is file b1
+ hg add a b
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b22
+ hg commit '-tcomment #1' -d '0 0' -u user
+ hg update 0
+ rm b
+ hg commit -A '-tcomment #2' -d '0 0' -u user
+ yes k
+ hg update 1
this update spans a branch affecting the following files:
aborting update spanning branches!
(use update -m to perform a branch merge)
+ exit 0