merge: allow merging going backwards

New behavior is generally superior and more correct, except possibly
with regards to missing files. hg up . is now effectively a no-op,
which is probably the desired behavior for people expecting to move to
tip, but may surprise people who were expecting deleted files to
reappear.

case 1: update to .

a-w -> a-w

classic: ancestor a
 missing     recreated     right?
 rmed        recreated     WRONG
 added       forgotten     WRONG
 changed     preserved     RIGHT
 conflicted  can't happen

backward merge: ancestor a  (NO EFFECT)
 missing     missing      wrong?
 rm'ed       rm'ed        RIGHT
 added       preserved	  RIGHT
 changed     preserved    RIGHT
 conflicted  can't happen

case 2: update to ancestor of .

a-b-w -> b-w
          \
           a

classic:  ancestor a
 missing       recreated        right?
 rmed          recreated        wrong?
 added         forgotten        wrong?
 changed       preserved        RIGHT
 conflicted    preserved        wrong?

backwards merge: ancestor b
 missing       missing or conflict  right?
 rm'ed         missing or conflict  right?
 changed       preserved            RIGHT
 conflicted    merge                RIGHT
 added         preserved            right?

mercurial/merge.py

@@ -1,497 +1,500 b''
 # merge.py - directory-level update/merge handling for Mercurial
 #
 # Copyright 2006, 2007 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2, incorporated herein by reference.
 
 from node import nullid, nullrev, hex, bin
 from i18n import _
 import util, filemerge, copies
 import errno, os, shutil
 
 class mergestate(object):
     '''track 3-way merge state of individual files'''
     def __init__(self, repo):
         self._repo = repo
         self._read()
     def reset(self, node=None):
         self._state = {}
         if node:
             self._local = node
         shutil.rmtree(self._repo.join("merge"), True)
     def _read(self):
         self._state = {}
         try:
             localnode = None
             f = self._repo.opener("merge/state")
             for i, l in enumerate(f):
                 if i == 0:
                     localnode = l[:-1]
                 else:
                     bits = l[:-1].split("\0")
                     self._state[bits[0]] = bits[1:]
             self._local = bin(localnode)
         except IOError, err:
             if err.errno != errno.ENOENT:
                 raise
     def _write(self):
         f = self._repo.opener("merge/state", "w")
         f.write(hex(self._local) + "\n")
         for d, v in self._state.iteritems():
             f.write("\0".join([d] + v) + "\n")
     def add(self, fcl, fco, fca, fd, flags):
         hash = util.sha1(fcl.path()).hexdigest()
         self._repo.opener("merge/" + hash, "w").write(fcl.data())
         self._state[fd] = ['u', hash, fcl.path(), fca.path(),
                            hex(fca.filenode()), fco.path(), flags]
         self._write()
     def __contains__(self, dfile):
         return dfile in self._state
     def __getitem__(self, dfile):
         return self._state[dfile][0]
     def __iter__(self):
         l = self._state.keys()
         l.sort()
         for f in l:
             yield f
     def mark(self, dfile, state):
         self._state[dfile][0] = state
         self._write()
     def resolve(self, dfile, wctx, octx):
         if self[dfile] == 'r':
             return 0
         state, hash, lfile, afile, anode, ofile, flags = self._state[dfile]
         f = self._repo.opener("merge/" + hash)
         self._repo.wwrite(dfile, f.read(), flags)
         fcd = wctx[dfile]
         fco = octx[ofile]
         fca = self._repo.filectx(afile, fileid=anode)
         r = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco, fca)
         if not r:
             self.mark(dfile, 'r')
         return r
 
 def _checkunknown(wctx, mctx):
     "check for collisions between unknown files and files in mctx"
     for f in wctx.unknown():
         if f in mctx and mctx[f].cmp(wctx[f].data()):
             raise util.Abort(_("untracked file in working directory differs"
                                " from file in requested revision: '%s'") % f)
 
 def _checkcollision(mctx):
     "check for case folding collisions in the destination context"
     folded = {}
     for fn in mctx:
         fold = fn.lower()
         if fold in folded:
             raise util.Abort(_("case-folding collision between %s and %s")
                              % (fn, folded[fold]))
         folded[fold] = fn
 
 def _forgetremoved(wctx, mctx, branchmerge):
     """
     Forget removed files
 
     If we're jumping between revisions (as opposed to merging), and if
     neither the working directory nor the target rev has the file,
     then we need to remove it from the dirstate, to prevent the
     dirstate from listing the file when it is no longer in the
     manifest.
 
     If we're merging, and the other revision has removed a file
     that is not present in the working directory, we need to mark it
     as removed.
     """
 
     action = []
     state = branchmerge and 'r' or 'f'
     for f in wctx.deleted():
         if f not in mctx:
             action.append((f, state))
 
     if not branchmerge:
         for f in wctx.removed():
             if f not in mctx:
                 action.append((f, "f"))
 
     return action
 
 def manifestmerge(repo, p1, p2, pa, overwrite, partial):
     """
     Merge p1 and p2 with ancestor ma and generate merge action list
 
     overwrite = whether we clobber working files
     partial = function to filter file lists
     """
 
     repo.ui.note(_("resolving manifests\n"))
     repo.ui.debug(_(" overwrite %s partial %s\n") % (overwrite, bool(partial)))
     repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (pa, p1, p2))
 
     m1 = p1.manifest()
     m2 = p2.manifest()
-    ma = pa.manifest()
     backwards = (pa == p2)
 
-    if backwards or overwrite:
+    if overwrite:
         ma = m1
+    elif backwards:
+        ma = p1.p1().manifest()
+    else:
+        ma = pa.manifest()
 
     action = []
     copy, copied, diverge = {}, {}, {}
 
     def fmerge(f, f2, fa):
         """merge flags"""
         a, m, n = ma.flags(fa), m1.flags(f), m2.flags(f2)
         if m == n: # flags agree
             return m # unchanged
         if m and n and not a: # flags set, don't agree, differ from parent
             r = repo.ui.prompt(
                 _(" conflicting flags for %s\n"
                   "(n)one, e(x)ec or sym(l)ink?") % f,
                 (_("&None"), _("E&xec"), _("Sym&link")), _("n"))
             return r != _("n") and r or ''
         if m and m != a: # changed from a to m
             return m
         if n and n != a: # changed from a to n
             return n
         return '' # flag was cleared
 
     def act(msg, m, f, *args):
         repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m))
         action.append((f, m) + args)
 
     if pa and not (backwards or overwrite):
         if repo.ui.configbool("merge", "followcopies", True):
             dirs = repo.ui.configbool("merge", "followdirs", True)
             copy, diverge = copies.copies(repo, p1, p2, pa, dirs)
         copied = set(copy.values())
         for of, fl in diverge.iteritems():
             act("divergent renames", "dr", of, fl)
 
     # Compare manifests
     for f, n in m1.iteritems():
         if partial and not partial(f):
             continue
         if f in m2:
             rflags = fmerge(f, f, f)
             # are files different?
             if n != m2[f]:
                 a = ma.get(f, nullid)
                 # are both different from the ancestor?
                 if n != a and m2[f] != a:
                     act("versions differ", "m", f, f, f, rflags, False)
                 # is remote's version newer?
                 elif m2[f] != a:
                     # are we clobbering?
                     if overwrite:
                         act("clobbering", "g", f, rflags)
                     # or are we going back in time and clean?
                     elif backwards:
                         if not n[20:] or not p2[f].cmp(p1[f].data()):
                             act("reverting", "g", f, rflags)
                     else:
                         act("remote is newer", "g", f, rflags)
                 # local is newer, not overwrite, check mode bits
                 elif m1.flags(f) != rflags:
                     act("update permissions", "e", f, rflags)
             # contents same, check mode bits
             elif m1.flags(f) != rflags:
                 act("update permissions", "e", f, rflags)
         elif f in copied:
             continue
         elif f in copy:
             f2 = copy[f]
             if f2 not in m2: # directory rename
                 act("remote renamed directory to " + f2, "d",
                     f, None, f2, m1.flags(f))
             elif f2 in m1: # case 2 A,B/B/B
                 act("local copied to " + f2, "m",
                     f, f2, f, fmerge(f, f2, f2), False)
             else: # case 4,21 A/B/B
                 act("local moved to " + f2, "m",
                     f, f2, f, fmerge(f, f2, f2), False)
         elif f in ma and not n[20:]:
             if n != ma[f]:
                 if repo.ui.prompt(
                     _(" local changed %s which remote deleted\n"
                       "use (c)hanged version or (d)elete?") % f,
                     (_("&Changed"), _("&Delete")), _("c")) == _("d"):
                     act("prompt delete", "r", f)
                 else:
                     act("prompt keep", "a", f)
             else:
                 act("other deleted", "r", f)
         elif n[20:] == "a": # only forget locally-added
             act("remote deleted", "f", f)
         else:
             # file is created on branch or in working directory
             if (overwrite and n[20:] != "u") or (backwards and not n[20:]):
                 act("remote deleted", "r", f)
 
     for f, n in m2.iteritems():
         if partial and not partial(f):
             continue
         if f in m1:
             continue
         if f in copied:
             continue
         if f in copy:
             f2 = copy[f]
             if f2 not in m1: # directory rename
                 act("local renamed directory to " + f2, "d",
                     None, f, f2, m2.flags(f))
             elif f2 in m2: # rename case 1, A/A,B/A
                 act("remote copied to " + f, "m",
                     f2, f, f, fmerge(f2, f, f2), False)
             else: # case 3,20 A/B/A
                 act("remote moved to " + f, "m",
                     f2, f, f, fmerge(f2, f, f2), True)
         elif f not in ma:
             act("remote created", "g", f, m2.flags(f))
         elif n != ma[f]:
             if repo.ui.prompt(
                 _("remote changed %s which local deleted\n"
                   "use (c)hanged version or leave (d)eleted?") % f,
                 (_("&Changed"), _("&Deleted")), _("c")) == _("c"):
                 act("prompt recreating", "g", f, m2.flags(f))
 
     return action
 
 def actionkey(a):
     return a[1] == 'r' and -1 or 0, a
 
 def applyupdates(repo, action, wctx, mctx):
     "apply the merge action list to the working directory"
 
     updated, merged, removed, unresolved = 0, 0, 0, 0
     ms = mergestate(repo)
     ms.reset(wctx.parents()[0].node())
     moves = []
     action.sort(key=actionkey)
 
     # prescan for merges
     for a in action:
         f, m = a[:2]
         if m == 'm': # merge
             f2, fd, flags, move = a[2:]
             repo.ui.debug(_("preserving %s for resolve of %s\n") % (f, fd))
             fcl = wctx[f]
             fco = mctx[f2]
             fca = fcl.ancestor(fco) or repo.filectx(f, fileid=nullrev)
             ms.add(fcl, fco, fca, fd, flags)
             if f != fd and move:
                 moves.append(f)
 
     # remove renamed files after safely stored
     for f in moves:
         if util.lexists(repo.wjoin(f)):
             repo.ui.debug(_("removing %s\n") % f)
             os.unlink(repo.wjoin(f))
 
     audit_path = util.path_auditor(repo.root)
 
     for a in action:
         f, m = a[:2]
         if f and f[0] == "/":
             continue
         if m == "r": # remove
             repo.ui.note(_("removing %s\n") % f)
             audit_path(f)
             try:
                 util.unlink(repo.wjoin(f))
             except OSError, inst:
                 if inst.errno != errno.ENOENT:
                     repo.ui.warn(_("update failed to remove %s: %s!\n") %
                                  (f, inst.strerror))
             removed += 1
         elif m == "m": # merge
             f2, fd, flags, move = a[2:]
             r = ms.resolve(fd, wctx, mctx)
             if r > 0:
                 unresolved += 1
             else:
                 if r is None:
                     updated += 1
                 else:
                     merged += 1
             util.set_flags(repo.wjoin(fd), 'l' in flags, 'x' in flags)
             if f != fd and move and util.lexists(repo.wjoin(f)):
                 repo.ui.debug(_("removing %s\n") % f)
                 os.unlink(repo.wjoin(f))
         elif m == "g": # get
             flags = a[2]
             repo.ui.note(_("getting %s\n") % f)
             t = mctx.filectx(f).data()
             repo.wwrite(f, t, flags)
             updated += 1
         elif m == "d": # directory rename
             f2, fd, flags = a[2:]
             if f:
                 repo.ui.note(_("moving %s to %s\n") % (f, fd))
                 t = wctx.filectx(f).data()
                 repo.wwrite(fd, t, flags)
                 util.unlink(repo.wjoin(f))
             if f2:
                 repo.ui.note(_("getting %s to %s\n") % (f2, fd))
                 t = mctx.filectx(f2).data()
                 repo.wwrite(fd, t, flags)
             updated += 1
         elif m == "dr": # divergent renames
             fl = a[2]
             repo.ui.warn(_("warning: detected divergent renames of %s to:\n") % f)
             for nf in fl:
                 repo.ui.warn(" %s\n" % nf)
         elif m == "e": # exec
             flags = a[2]
             util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags)
 
     return updated, merged, removed, unresolved
 
 def recordupdates(repo, action, branchmerge):
     "record merge actions to the dirstate"
 
     for a in action:
         f, m = a[:2]
         if m == "r": # remove
             if branchmerge:
                 repo.dirstate.remove(f)
             else:
                 repo.dirstate.forget(f)
         elif m == "a": # re-add
             if not branchmerge:
                 repo.dirstate.add(f)
         elif m == "f": # forget
             repo.dirstate.forget(f)
         elif m == "e": # exec change
             repo.dirstate.normallookup(f)
         elif m == "g": # get
             if branchmerge:
                 repo.dirstate.normaldirty(f)
             else:
                 repo.dirstate.normal(f)
         elif m == "m": # merge
             f2, fd, flag, move = a[2:]
             if branchmerge:
                 # We've done a branch merge, mark this file as merged
                 # so that we properly record the merger later
                 repo.dirstate.merge(fd)
                 if f != f2: # copy/rename
                     if move:
                         repo.dirstate.remove(f)
                     if f != fd:
                         repo.dirstate.copy(f, fd)
                     else:
                         repo.dirstate.copy(f2, fd)
             else:
                 # We've update-merged a locally modified file, so
                 # we set the dirstate to emulate a normal checkout
                 # of that file some time in the past. Thus our
                 # merge will appear as a normal local file
                 # modification.
                 repo.dirstate.normallookup(fd)
                 if move:
                     repo.dirstate.forget(f)
         elif m == "d": # directory rename
             f2, fd, flag = a[2:]
             if not f2 and f not in repo.dirstate:
                 # untracked file moved
                 continue
             if branchmerge:
                 repo.dirstate.add(fd)
                 if f:
                     repo.dirstate.remove(f)
                     repo.dirstate.copy(f, fd)
                 if f2:
                     repo.dirstate.copy(f2, fd)
             else:
                 repo.dirstate.normal(fd)
                 if f:
                     repo.dirstate.forget(f)
 
 def update(repo, node, branchmerge, force, partial):
     """
     Perform a merge between the working directory and the given node
 
     branchmerge = whether to merge between branches
     force = whether to force branch merging or file overwriting
     partial = a function to filter file lists (dirstate not updated)
     """
 
     wlock = repo.wlock()
     try:
         wc = repo[None]
         if node is None:
             # tip of current branch
             try:
                 node = repo.branchtags()[wc.branch()]
             except KeyError:
                 if wc.branch() == "default": # no default branch!
                     node = repo.lookup("tip") # update to tip
                 else:
                     raise util.Abort(_("branch %s not found") % wc.branch())
         overwrite = force and not branchmerge
         pl = wc.parents()
         p1, p2 = pl[0], repo[node]
         pa = p1.ancestor(p2)
         fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)
         fastforward = False
 
         ### check phase
         if not overwrite and len(pl) > 1:
             raise util.Abort(_("outstanding uncommitted merges"))
         if branchmerge:
             if pa == p2:
                 raise util.Abort(_("can't merge with ancestor"))
             elif pa == p1:
                 if p1.branch() != p2.branch():
                     fastforward = True
                 else:
                     raise util.Abort(_("nothing to merge (use 'hg update'"
                                        " or check 'hg heads')"))
             if not force and (wc.files() or wc.deleted()):
                 raise util.Abort(_("outstanding uncommitted changes "
                                    "(use 'hg status' to list changes)"))
         elif not overwrite:
             if pa == p1 or pa == p2: # linear
                 pass # all good
             elif p1.branch() == p2.branch():
                 if wc.files() or wc.deleted():
                     raise util.Abort(_("crosses branches (use 'hg merge' or "
                                        "'hg update -C' to discard changes)"))
                 raise util.Abort(_("crosses branches (use 'hg merge' "
                                    "or 'hg update -C')"))
             elif wc.files() or wc.deleted():
                 raise util.Abort(_("crosses named branches (use "
                                    "'hg update -C' to discard changes)"))
             else:
                 # Allow jumping branches if there are no changes
                 overwrite = True
 
         ### calculate phase
         action = []
         if not force:
             _checkunknown(wc, p2)
         if not util.checkcase(repo.path):
             _checkcollision(p2)
         action += _forgetremoved(wc, p2, branchmerge)
         action += manifestmerge(repo, wc, p2, pa, overwrite, partial)
 
         ### apply phase
         if not branchmerge: # just jump to the new rev
             fp1, fp2, xp1, xp2 = fp2, nullid, xp2, ''
         if not partial:
             repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
 
         stats = applyupdates(repo, action, wc, p2)
 
         if not partial:
             recordupdates(repo, action, branchmerge)
             repo.dirstate.setparents(fp1, fp2)
             if not branchmerge and not fastforward:
                 repo.dirstate.setbranch(p2.branch())
             repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
 
         return stats
     finally:
         wlock.release()

tests/test-custom-filters

@@ -1,60 +1,60 b''
 #!/bin/sh
 
 hg init
 
 cat > .hg/hgrc <<EOF
 [extensions]
 prefixfilter = prefix.py
 [encode]
 *.txt = stripprefix: Copyright 2046, The Masters
 [decode]
 *.txt = insertprefix: Copyright 2046, The Masters
 EOF
 
 cat > prefix.py <<EOF
 from mercurial import util
 def stripprefix(s, cmd, filename, **kwargs):
     header = '%s\n' % cmd
     if s[:len(header)] != header:
         raise util.Abort('missing header "%s" in %s' % (cmd, filename))
     return s[len(header):]
 def insertprefix(s, cmd):
     return '%s\n%s' % (cmd, s)
 def reposetup(ui, repo):
     repo.adddatafilter('stripprefix:', stripprefix)
     repo.adddatafilter('insertprefix:', insertprefix)
 EOF
 
 cat > .hgignore <<EOF
 .hgignore
 prefix.py
 prefix.pyc
 EOF
 
 cat > stuff.txt <<EOF
 Copyright 2046, The Masters
 Some stuff to ponder very carefully.
 EOF
 hg add stuff.txt
 hg ci -m stuff
 
 echo '% Repository data:'
 hg cat stuff.txt
 
 echo '% Fresh checkout:'
 rm stuff.txt
-hg up
+hg up -C
 cat stuff.txt
 echo >> stuff.txt <<EOF
 Very very carefully.
 EOF
 hg stat
 
 cat > morestuff.txt <<EOF
 Unauthorized material subject to destruction.
 EOF
 
 echo '% Problem encoding:'
 hg add morestuff.txt
 hg ci -m morestuff
 hg stat

tests/test-encode

@@ -1,42 +1,42 b''
 #!/bin/sh
 
 hg init
 
 cat > .hg/hgrc <<EOF
 [encode]
 *.gz = gzip -d
 
 [decode]
 *.gz = gzip
 
 EOF
 
 echo "this is a test" | gzip > a.gz
 hg add a.gz
 hg ci -m "test" -d "1000000 0"
 echo %% no changes
 hg status
 touch a.gz
 
 echo %% no changes
 hg status
 
 echo %% uncompressed contents in repo
 hg debugdata .hg/store/data/a.gz.d 0
 
 echo %% uncompress our working dir copy
 gunzip < a.gz
 
 rm a.gz
-hg co
+hg co -C
 
 echo %% uncompress our new working dir copy
 gunzip < a.gz
 
 echo %% check hg cat operation
 hg cat a.gz
 hg cat --decode a.gz | gunzip
 mkdir subdir
 cd subdir
 hg -R .. cat ../a.gz
 hg -R .. cat --decode ../a.gz | gunzip

tests/test-execute-bit.out

@@ -1,8 +1,8 b''
 adding a
 79abf14474dc tip
 % make sure we notice the change of mode if the cached size == -1
 n   0         -1 unset               a
 M a
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 d69afc33ff8a
 not executable -- whew

tests/test-keyword

@@ -1,343 +1,343 b''
 #!/bin/sh
 
 cat <<EOF >> $HGRCPATH
 [extensions]
 hgext.keyword =
 hgext.mq =
 hgext.notify =
 [keyword]
 * =
 b = ignore
 [hooks]
 commit=
 commit.test=cp a hooktest
 EOF
 
 echo % help
 hg help keyword
 
 echo % hg kwdemo
 hg --quiet kwdemo --default \
 | sed -e 's![^ ][^ ]*demo.txt,v!/TMP/demo.txt,v!' \
  -e 's/,v [a-z0-9][a-z0-9]* /,v xxxxxxxxxxxx /' \
  -e '/[$]Revision/ s/: [a-z0-9][a-z0-9]* /: xxxxxxxxxxxx /' \
  -e 's! 20[0-9][0-9]/[01][0-9]/[0-3][0-9] [0-2][0-9]:[0-6][0-9]:[0-6][0-9]! 2000/00/00 00:00:00!'
 
 hg --quiet kwdemo "Branch = {branches}"
 
 hg init Test-bndl
 cd Test-bndl
 
 echo % kwshrink should exit silently in empty/invalid repo
 hg kwshrink
 
 # Symlinks cannot be created on Windows. The bundle was made with:
 #
 # hg init t
 # cd t
 # echo a > a
 # ln -s a sym
 # hg add sym
 # hg ci -m addsym -u mercurial
 # hg bundle --base null ../test-keyword.hg
 #
 hg pull -u "$TESTDIR/test-keyword.hg" \
     | sed 's/pulling from.*test-keyword.hg/pulling from test-keyword.hg/'
 
 echo 'expand $Id$' > a
 echo 'do not process $Id:' >> a
 echo 'xxx $' >> a
 echo 'ignore $Id$' > b
 echo % cat
 cat a b
 
 echo % addremove
 hg addremove
 echo % status
 hg status
 
 echo % default keyword expansion including commit hook
 echo % interrupted commit should not change state or run commit hook
 hg --debug commit
 echo % status
 hg status
 
 echo % commit
 hg --debug commit -mabsym -u 'User Name <[e-mail]>'
 echo % status
 hg status
 echo % identify
 hg debugrebuildstate
 hg --quiet identify
 echo % cat
 cat a b
 echo % hg cat
 hg cat sym a b
 
 echo
 echo % diff a hooktest
 diff a hooktest
 
 echo % removing commit hook from config
 sed -e '/\[hooks\]/,$ d' $HGRCPATH > $HGRCPATH.nohook
 mv $HGRCPATH.nohook $HGRCPATH
 rm hooktest
 
 echo % bundle
 hg bundle --base null ../kw.hg
 
 cd ..
 hg init Test
 cd Test
 
 echo % notify on pull to check whether keywords stay as is in email
 echo % ie. if patch.diff wrapper acts as it should
 
 cat <<EOF >> $HGRCPATH
 [hooks]
 incoming.notify = python:hgext.notify.hook
 [notify]
 sources = pull
 diffstat = False
 [reposubs]
 * = Test
 EOF
 
 echo % pull from bundle
 hg pull -u ../kw.hg 2>&1 | sed -e '/^Content-Type:/,/^diffs (/ d'
 
 echo % remove notify config
 sed -e '/\[hooks\]/,$ d' $HGRCPATH > $HGRCPATH.nonotify
 mv $HGRCPATH.nonotify $HGRCPATH
 
 echo % touch
 touch a b
 echo % status
 hg status
 
 rm sym a b
 echo % update
-hg update
+hg update -C
 echo % cat
 cat a b
 
 echo % check whether expansion is filewise
 echo '$Id$' > c
 echo 'tests for different changenodes' >> c
 echo % commit c
 hg commit -A -mcndiff -d '1 0' -u 'User Name <[e-mail]>'
 echo % force expansion
 hg -v kwexpand
 echo % compare changenodes in a c
 cat a c
 
 echo % qinit -c
 hg qinit -c
 echo % qimport
 hg qimport -r tip -n mqtest.diff
 echo % qcommit
 hg qcommit -mqtest
 echo % keywords should not be expanded in patch
 cat .hg/patches/mqtest.diff
 echo % qpop
 hg qpop
 echo % qgoto - should imply qpush
 hg qgoto mqtest.diff
 echo % cat
 cat c
 echo % qpop and move on
 hg qpop
 
 echo % copy
 hg cp a c
 
 echo % kwfiles added
 hg kwfiles
 
 echo % commit
 hg --debug commit -ma2c -d '1 0' -u 'User Name <[e-mail]>'
 echo % cat a c
 cat a c
 echo % touch copied c
 touch c
 echo % status
 hg status
 
 echo % kwfiles
 hg kwfiles
 
 echo % diff --rev
 hg diff --rev 1 | grep -v 'b/c'
 
 echo % rollback
 hg rollback
 echo % status
 hg status
 echo % update -C
 hg update --clean
 
 echo % custom keyword expansion
 echo % try with kwdemo
 hg --quiet kwdemo "Xinfo = {author}: {desc}"
 
 cat <<EOF >>$HGRCPATH
 [keywordmaps]
 Id = {file} {node|short} {date|rfc822date} {author|user}
 Xinfo = {author}: {desc}
 EOF
 
 echo % cat
 cat a b
 echo % hg cat
 hg cat sym a b
 
 echo
 echo '$Xinfo$' >> a
 cat <<EOF >> log
 firstline
 secondline
 EOF
 
 echo % interrupted commit should not change state
 hg commit
 echo % status
 hg status
 
 echo % commit
 hg --debug commit -l log -d '2 0' -u 'User Name <[e-mail]>'
 rm log
 echo % status
 hg status
 echo % verify
 hg verify
 
 echo % cat
 cat a b
 echo % hg cat
 hg cat sym a b
 echo
 echo % annotate
 hg annotate a
 
 echo % remove
 hg debugrebuildstate
 hg remove a
 hg --debug commit -m rma
 echo % status
 hg status
 echo % rollback
 hg rollback
 echo % status
 hg status
 echo % revert a
 hg revert --no-backup --rev tip a
 echo % cat a
 cat a
 
 echo % clone to test incoming
 cd ..
 hg clone -r1 Test Test-a
 cd Test-a
 cat <<EOF >> .hg/hgrc
 [paths]
 default = ../Test
 EOF
 echo % incoming
 # remove path to temp dir
 hg incoming | sed -e 's/^\(comparing with \).*\(test-keyword.*\)/\1\2/'
 
 sed -e 's/Id.*/& rejecttest/' a > a.new
 mv a.new a
 echo % commit rejecttest
 hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <[e-mail]>'
 echo % export
 hg export -o ../rejecttest.diff tip
 
 cd ../Test
 echo % import
 hg import ../rejecttest.diff
 echo % cat
 cat a b
 echo
 echo % rollback
 hg rollback
 echo % clean update
 hg update --clean
 
 echo % kwexpand/kwshrink on selected files
 mkdir x
 echo % copy a x/a
 hg copy a x/a
 echo % kwexpand a
 hg --verbose kwexpand a
 echo % kwexpand x/a should abort
 hg --verbose kwexpand x/a
 cd x
 hg --debug commit -m xa -d '3 0' -u 'User Name <[e-mail]>'
 echo % cat a
 cat a
 echo % kwshrink a inside directory x
 hg --verbose kwshrink a
 echo % cat a
 cat a
 cd ..
 
 echo % kwexpand nonexistent
 hg kwexpand nonexistent 2>&1 | sed 's/nonexistent:.*/nonexistent:/'
 
 echo % hg serve
 hg serve -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
 cat hg.pid >> $DAEMON_PIDS
 echo % expansion
 echo % hgweb file
 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/file/tip/a/?style=raw')
 echo % no expansion
 echo % hgweb annotate
 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/annotate/tip/a/?style=raw')
 echo % hgweb changeset
 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/rev/tip/?style=raw')
 echo % hgweb filediff
 ("$TESTDIR/get-with-headers.py" localhost:$HGPORT '/diff/bb948857c743/a?style=raw')
 echo % errors encountered
 cat errors.log
 
 echo % merge/resolve
 echo '$Id$' > m
 hg add m
 hg commit -m 4kw 
 echo foo >> m
 hg commit -m 5foo
 echo % simplemerge
 hg update 4
 echo foo >> m
 hg commit -m 6foo
 hg merge
 hg commit -m simplemerge
 cat m
 echo % conflict
 hg update 4
 echo bar >> m
 hg commit -m 8bar
 hg merge
 echo % keyword stays outside conflict zone
 cat m
 echo % resolve to local
 HGMERGE=internal:local hg resolve -a
 hg commit -m localresolve
 cat m
 
 echo % switch off expansion
 echo % kwshrink with unknown file u
 cp a u
 hg --verbose kwshrink
 echo % cat
 cat a b
 echo % hg cat
 hg cat sym a b
 echo
 rm $HGRCPATH
 echo % cat
 cat a b
 echo % hg cat
 hg cat sym a b
 echo

tests/test-merge-local.out

@@ -1,63 +1,65 b''
 # revision 0
 adding copy
 adding move
 adding remove
 adding unchanged
 adding zzz1_merge_ok
 adding zzz2_merge_bad
 # revision 1
 # local changes to revision 0
 4 files updated, 0 files merged, 3 files removed, 0 files unresolved
 --- a/zzz1_merge_ok
 +++ b/zzz1_merge_ok
 +new last line
 --- a/zzz2_merge_bad
 +++ b/zzz2_merge_bad
 +another last line
 M zzz1_merge_ok
 M zzz2_merge_bad
 # local merge with bad merge tool
 merging zzz1_merge_ok
 merging zzz2_merge_bad
 merging zzz2_merge_bad failed!
 3 files updated, 1 files merged, 2 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges
-2 files updated, 0 files merged, 3 files removed, 0 files unresolved
+merging zzz1_merge_ok
+merging zzz2_merge_bad
+2 files updated, 2 files merged, 3 files removed, 0 files unresolved
 --- a/zzz1_merge_ok
 +++ b/zzz1_merge_ok
 +new first line
 +new last line
 --- a/zzz2_merge_bad
 +++ b/zzz2_merge_bad
 +another last line
 M zzz1_merge_ok
 M zzz2_merge_bad
-? zzz2_merge_bad.orig
 # local merge with conflicts
 merging zzz1_merge_ok
 merging zzz2_merge_bad
 warning: conflicts during merge.
 merging zzz2_merge_bad failed!
 3 files updated, 1 files merged, 2 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges
-2 files updated, 0 files merged, 3 files removed, 0 files unresolved
+merging zzz1_merge_ok
+merging zzz2_merge_bad
+2 files updated, 2 files merged, 3 files removed, 0 files unresolved
 --- a/zzz1_merge_ok
 +++ b/zzz1_merge_ok
 +new first line
 +new last line
 --- a/zzz2_merge_bad
 +++ b/zzz2_merge_bad
 +another last line
 +=======
 +new last line
 M zzz1_merge_ok
 M zzz2_merge_bad
-? zzz2_merge_bad.orig
 # local merge without conflicts
 merging zzz1_merge_ok
 4 files updated, 1 files merged, 2 files removed, 0 files unresolved
 --- a/zzz1_merge_ok
 +++ b/zzz1_merge_ok
 +new last line
 M zzz1_merge_ok
 ? zzz2_merge_bad.orig

tests/test-up-local-change.out

@@ -1,153 +1,159 b''
 adding a
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 diff -r 33aaa84a386b a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -a
 +abc
 adding b
 M a
 changeset:   0:33aaa84a386b
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 resolving manifests
  overwrite False partial False
  ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
   searching for copies back to rev 1
   unmatched files in other:
    b
  a: versions differ -> m
  b: remote created -> g
 preserving a for resolve of a
 picked tool 'true' for a (binary False symlink False)
 merging a
 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
 getting b
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 changeset:   1:802f095af299
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 resolving manifests
  overwrite False partial False
  ancestor 33aaa84a386b local 802f095af299+ remote 33aaa84a386b
+ a: versions differ -> m
  b: other deleted -> r
+preserving a for resolve of a
 removing b
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+picked tool 'true' for a (binary False symlink False)
+merging a
+my a@802f095af299+ other a@33aaa84a386b ancestor a@33aaa84a386b
+ premerge successful
+0 files updated, 1 files merged, 1 files removed, 0 files unresolved
 changeset:   0:33aaa84a386b
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 abort: there is nothing to merge - use "hg update" instead
 failed
 changeset:   0:33aaa84a386b
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 resolving manifests
  overwrite False partial False
  ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
   searching for copies back to rev 1
   unmatched files in other:
    b
  a: versions differ -> m
  b: remote created -> g
 preserving a for resolve of a
 picked tool 'true' for a (binary False symlink False)
 merging a
 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
 getting b
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 changeset:   1:802f095af299
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 changeset:   1:802f095af299
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 files:       a b
 description:
 2
 
 
 changeset:   0:33aaa84a386b
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 files:       a
 description:
 1
 
 
 diff -r 802f095af299 a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -a2
 +abc
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding b
 created new head
 M a
 changeset:   1:802f095af299
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
 failed
 abort: outstanding uncommitted changes (use 'hg status' to list changes)
 failed
 resolving manifests
  overwrite False partial False
  ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d
   searching for copies back to rev 1
  a: versions differ -> m
  b: versions differ -> m
 preserving a for resolve of a
 preserving b for resolve of b
 picked tool 'true' for a (binary False symlink False)
 merging a
 my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b
 picked tool 'true' for b (binary False symlink False)
 merging b
 my b@802f095af299+ other b@030602aee63d ancestor b@000000000000
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 changeset:   1:802f095af299
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 changeset:   2:030602aee63d
 tag:         tip
 parent:      0:33aaa84a386b
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     3
 
 diff -r 802f095af299 a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -a2
 +abc
 adding a
 pulling from ../a
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-win32text

@@ -1,160 +1,160 b''
 #!/bin/sh
 
 hg init t
 cd t
 
 cat > unix2dos.py <<EOF
 import sys
 
 for path in sys.argv[1:]:
     data = file(path, 'rb').read()
     data = data.replace('\n', '\r\n')
     file(path, 'wb').write(data)
 EOF
 
 cat > print.py <<EOF
 import sys
 print(sys.stdin.read().replace('\n', '<LF>').replace('\r', '<CR>').replace('\0', '<NUL>'))
 EOF
 
 echo '[hooks]' >> .hg/hgrc
 echo 'pretxncommit.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc
 echo 'pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf' >> .hg/hgrc
 cat .hg/hgrc
 echo
 
 echo hello > f
 hg add f
 echo commit should succeed
 hg ci -m 1
 echo
 
 hg clone . ../zoz
 cp .hg/hgrc ../zoz/.hg
 
 python unix2dos.py f
 echo commit should fail
 hg ci -m 2.1
 echo
 
 mv .hg/hgrc .hg/hgrc.bak
 echo commits should succeed
 hg ci -m 2
 hg cp f g
 hg ci -m 2.2
 echo
 
 echo push should fail
 hg push ../zoz
 echo
 
 mv .hg/hgrc.bak .hg/hgrc
 echo hello > f
 hg rm g
 echo commit should succeed
 hg ci -m 2.3
 echo
 
 echo push should succeed
 hg push ../zoz
 echo
 
 echo and now for something completely different
 mkdir d
 echo hello > d/f2
 python unix2dos.py d/f2
 hg add d/f2
 hg ci -m 3
 hg revert -a
 rm d/f2
 echo
 
 hg rem f
 hg ci -m 4
 echo
 
 python -c 'file("bin", "wb").write("hello\x00\x0D\x0A")'
 hg add bin
 hg ci -m 5
 hg log -v
 echo
 
 hg clone . dupe
 echo
 for x in a b c d; do echo content > dupe/$x; done
 hg -R dupe add
 python unix2dos.py dupe/b dupe/c dupe/d
 hg -R dupe ci -m a dupe/a
 hg -R dupe ci -m b/c dupe/[bc]
 hg -R dupe ci -m d dupe/d
 hg -R dupe log -v
 echo
 
 hg pull dupe
 echo
 
 hg log -v
 echo
 
 rm .hg/hgrc
 (echo some; echo text) > f3
 python -c 'file("f4.bat", "wb").write("rem empty\x0D\x0A")'
 hg add f3 f4.bat
 hg ci -m 6
 
 python print.py < bin
 python print.py < f3
 python print.py < f4.bat
 echo
 
 echo '[extensions]' >> .hg/hgrc
 echo 'win32text = ' >> .hg/hgrc
 echo '[decode]' >> .hg/hgrc
 echo '** = cleverdecode:' >> .hg/hgrc
 echo '[encode]' >> .hg/hgrc
 echo '** = cleverencode:' >> .hg/hgrc
 cat .hg/hgrc
 echo
 
 rm f3 f4.bat bin
-hg co 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))'
+hg co -C 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))'
 python print.py < bin
 python print.py < f3
 python print.py < f4.bat
 echo
 
 python -c 'file("f5.sh", "wb").write("# empty\x0D\x0A")'
 hg add f5.sh
 hg ci -m 7
 python print.py < f5.sh
 hg cat f5.sh | python print.py
 
 echo '% just linefeed' > linefeed
 hg ci -qAm 8 linefeed
 python print.py < linefeed
 hg cat linefeed | python print.py
 hg st -q
 hg revert -a linefeed
 python print.py < linefeed
 hg st -q
 echo modified >> linefeed
 hg st -q
 hg revert -a
 hg st -q
 python print.py < linefeed
 
 echo "# disable extension again"
 echo '[decode]' >> .hg/hgrc
 echo '** = !' >> .hg/hgrc
 echo '[encode]' >> .hg/hgrc
 echo '** = !' >> .hg/hgrc
 cat .hg/hgrc
 echo
 
 rm f3 f4.bat bin
-hg co 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))'
+hg co -C 2>&1 | python -c 'import sys, os; sys.stdout.write(sys.stdin.read().replace(os.getcwd(), "...."))'
 python print.py < bin
 python print.py < f3
 python print.py < f4.bat
 echo
 

tests/test-win32text.out

@@ -1,321 +1,321 b''
 [hooks]
 pretxncommit.crlf = python:hgext.win32text.forbidcrlf
 pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf
 
 commit should succeed
 
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 commit should fail
 Attempt to commit or push text file(s) using CRLF line endings
 in f583ea08d42a: f
 transaction abort!
 rollback completed
 abort: pretxncommit.crlf hook failed
 
 commits should succeed
 
 push should fail
 pushing to ../zoz
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 2 files
 Attempt to commit or push text file(s) using CRLF line endings
 in b94ebd309a6d: g
 in b1aa5cde7ff4: f
 
 To prevent this mistake in your local repository,
 add to Mercurial.ini or .hg/hgrc:
 
 [hooks]
 pretxncommit.crlf = python:hgext.win32text.forbidcrlf
 
 and also consider adding:
 
 [extensions]
 hgext.win32text =
 [encode]
 ** = cleverencode:
 [decode]
 ** = cleverdecode:
 transaction abort!
 rollback completed
 abort: pretxnchangegroup.crlf hook failed
 
 commit should succeed
 
 push should succeed
 pushing to ../zoz
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 2 files
 
 and now for something completely different
 Attempt to commit or push text file(s) using CRLF line endings
 in cefdb8d0b741: d/f2
 transaction abort!
 rollback completed
 abort: pretxncommit.crlf hook failed
 forgetting d/f2
 
 
 changeset:   5:d4ea9ae21be3
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       bin
 description:
 5
 
 
 changeset:   4:6ba409927d51
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 4
 
 
 changeset:   3:788a4e595187
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f g
 description:
 2.3
 
 
 changeset:   2:b94ebd309a6d
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       g
 description:
 2.2
 
 
 changeset:   1:b1aa5cde7ff4
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 2
 
 
 changeset:   0:fcf06d5c4e1d
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 1
 
 
 
 updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
 adding dupe/a
 adding dupe/b
 adding dupe/c
 adding dupe/d
 changeset:   8:7654104f33c3
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       d
 description:
 d
 
 
 changeset:   7:9be4c2808cc9
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       b c
 description:
 b/c
 
 
 changeset:   6:aa4367ed325a
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       a
 description:
 a
 
 
 changeset:   5:d4ea9ae21be3
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       bin
 description:
 5
 
 
 changeset:   4:6ba409927d51
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 4
 
 
 changeset:   3:788a4e595187
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f g
 description:
 2.3
 
 
 changeset:   2:b94ebd309a6d
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       g
 description:
 2.2
 
 
 changeset:   1:b1aa5cde7ff4
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 2
 
 
 changeset:   0:fcf06d5c4e1d
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 1
 
 
 
 pulling from dupe
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 4 changes to 4 files
 Attempt to commit or push text file(s) using CRLF line endings
 in 7654104f33c3: d
 in 9be4c2808cc9: b
 in 9be4c2808cc9: c
 
 To prevent this mistake in your local repository,
 add to Mercurial.ini or .hg/hgrc:
 
 [hooks]
 pretxncommit.crlf = python:hgext.win32text.forbidcrlf
 
 and also consider adding:
 
 [extensions]
 hgext.win32text =
 [encode]
 ** = cleverencode:
 [decode]
 ** = cleverdecode:
 transaction abort!
 rollback completed
 abort: pretxnchangegroup.crlf hook failed
 
 changeset:   5:d4ea9ae21be3
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       bin
 description:
 5
 
 
 changeset:   4:6ba409927d51
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 4
 
 
 changeset:   3:788a4e595187
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f g
 description:
 2.3
 
 
 changeset:   2:b94ebd309a6d
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       g
 description:
 2.2
 
 
 changeset:   1:b1aa5cde7ff4
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 2
 
 
 changeset:   0:fcf06d5c4e1d
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 files:       f
 description:
 1
 
 
 
 hello<NUL><CR><LF>
 some<LF>text<LF>
 rem empty<CR><LF>
 
 [extensions]
 win32text = 
 [decode]
 ** = cleverdecode:
 [encode]
 ** = cleverencode:
 
 WARNING: f4.bat already has CRLF line endings
 and does not need EOL conversion by the win32text plugin.
 Before your next commit, please reconsider your encode/decode settings in 
 Mercurial.ini or ..../.hg/hgrc.
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 hello<NUL><CR><LF>
 some<CR><LF>text<CR><LF>
 rem empty<CR><LF>
 
 # empty<CR><LF>
 # empty<LF>
 % just linefeed<LF>
 % just linefeed<LF>
 no changes needed to linefeed
 % just linefeed<LF>
 M linefeed
 reverting linefeed
 % just linefeed<CR><LF>
 # disable extension again
 [extensions]
 win32text = 
 [decode]
 ** = cleverdecode:
 [encode]
 ** = cleverencode:
 [decode]
 ** = !
 [encode]
 ** = !
 
-3 files updated, 0 files merged, 0 files removed, 0 files unresolved
+4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 hello<NUL><CR><LF>
 some<LF>text<LF>
 rem empty<LF>