comparison contrib/hg-ssh @ 23493:28f01c318c05

largefiles: don't use 'r' action for standin that doesn't exist When merging and the remote has turned a normal file into a largefile and the user chooses to keep the local largefile, we use the 'r' action for the remote largefile standin. This is wrong, since that file does not exist in the parent of the working copy. Use 'k', which does nothing but debug logging, instead.
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 05 Dec 2014 16:45:52 -0800
parents 1ba3e17186c8
children 2b9cda9040f7
comparison
equal deleted inserted replaced
23492:da733837cdd0 23493:28f01c318c05