Mercurial: 1536ccac47e9

changeset 226:1536ccac47e9

merge: don't bail on outstanding changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge: don't bail on outstanding changes With multiple heads, we don't need to worry about the working dir's uncommitted changes at pull time manifest hash: 5b4e024f220fa616732310ce5f48e71abfa910e0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoMFQywK+sNU5EO8RApLyAKCoNDF84wFzgnpS+WLuXdkGxeHFPwCdFsMy CysB458dNcFuB/vDFhgJr58= =gG+u -----END PGP SIGNATURE-----

author mpm@selenic.com

date Fri, 03 Jun 2005 12:45:04 -0800

parents 1651a3e61925

children f57519cddd3d

files hg

diffstat

1 files changed, 0 insertions(+), 5 deletions(-) [+]

line wrap: on

line diff

--- a/hg	Fri Jun 03 12:44:01 2005 -0800
+++ b/hg	Fri Jun 03 12:45:04 2005 -0800
@@ -356,11 +356,6 @@
     print "}"
 
 elif cmd == "merge":
-    (c, a, d, u) = repo.diffdir(repo.root, repo.current)
-    if c or a or d:
-        ui.warn("aborting (outstanding changes in working directory)\n")
-        sys.exit(1)
-
     if args:
         paths = {}
         try: