Mercurial > hg
diff mercurial/pathencode.c @ 18632:3e20079117c5
merge: handle subrepo merges and .hgsubstate specially
In an upcoming patch, we will update .hgsubstate in a non-interactive
worker process. Merges of subrepo contents will still need to occur in the
master process (since they may be interactive), so we move that code into
a place where it will always run in what will become the master process.
author | Bryan O'Sullivan <bryano@fb.com> |
---|---|
date | Sat, 09 Feb 2013 15:22:08 -0800 |
parents | 8bd338c7c4c9 |
children | 55c6ab8163ec |