# unmerged: profiles/package.mask
on the remote package.mask is a file locally it is a directory.
I need to know how I can resolve this merge without mergetool as
currently mergetool doesn't handle it well.
I want to delete the remote version of package.mask
tried:
git rm :3:profiles/package.mask
fatal: pathspec ':3:profiles/package.mask' did not match any files
mergetool will move my directory to a backup directory if I tell it to
delete package.mask it doesn't move the directory back into place, if
I tell it to use the remote version it obviously copies it into
place... I'd be ok if when I told it to delete it, it restored the
directory from backup.
regardless of mergetools problems I'd like to know how to fix this
merge without mergetool.
--
Caleb Cushing
http://xenoterracide.blogspot.com
On Tue, Feb 24, 2009 at 01:04:23AM -0500, Caleb Cushing wrote:
regardless of mergetools problems I'd like to know how to fix this
merge without mergetool.
I see you've now resolved this without mergetool, I'll look at adding
a test case to mergetool and see how easy it is to get it to handle
this case better.
--
Charles Bailey
http://ccgi.hashpling.plus.com/blog/
On Tue, Feb 24, 2009 at 2:47 AM, Charles Bailey [off-list ref] wrote:
I'll look at adding
a test case to mergetool and see how easy it is to get it to handle
this case better.
few weeks back I created a patch for mergetool, it was rejected
ultimately on the basis that it had to cleanup temporary files and in
reality this was a problem with a lot of mergetool, the suggestion was
made that mergetool needs refactoring. I believe this problem is a
similar symptom. basically mergetool should touch my files before I
tell it what to do. if it has to move and back up my files before
deciding then at the very least it should copy them back into place if
I delete the remote. preferably in this case though it would just
delete the remote or backup my local files and copy the remote in
after I told it what to do (or maybe even delete my local files).
--
Caleb Cushing
http://xenoterracide.blogspot.com
On Tue, Feb 24, 2009 at 03:32:50AM -0500, Caleb Cushing wrote:
On Tue, Feb 24, 2009 at 2:47 AM, Charles Bailey [off-list ref] wrote:
quoted
I'll look at adding
a test case to mergetool and see how easy it is to get it to handle
this case better.
few weeks back I created a patch for mergetool, it was rejected
ultimately on the basis that it had to cleanup temporary files and in
reality this was a problem with a lot of mergetool, the suggestion was
made that mergetool needs refactoring. I believe this problem is a
similar symptom. basically mergetool should touch my files before I
tell it what to do. if it has to move and back up my files before
deciding then at the very least it should copy them back into place if
I delete the remote. preferably in this case though it would just
delete the remote or backup my local files and copy the remote in
after I told it what to do (or maybe even delete my local files).
Coincidentally, last night I started looking at a mergetool
refactoring but more with unifying the handling of temporaries and
actions between the different types of merge (symlink, deleted file
and 'normal').
I'm more of the opinion that in any non-trivial case (i.e. not a
regular file/file merge), it *shouldn't* do anything until you tell it
what you want it to do. Clearly, between a tree and a blob, mergetool
is not going to be able to invoke a mergetool on set of three blobs,
but it should work out what it can do before prompting for a choice
from the user of what they want it to do.
--
Charles Bailey
http://ccgi.hashpling.plus.com/blog/