[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: [PATCH] Stgit - gitmergeonefile.py: handle removal vs. changes
From:       Blaisorblade <blaisorblade () yahoo ! it>
Date:       2005-12-30 17:59:50
Message-ID: 200512301859.51000.blaisorblade () yahoo ! it
[Download RAW message or body]

On Tuesday 15 November 2005 10:54, Catalin Marinas wrote:
> On 13/11/05, Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> wrote:
> > I just got a "removal vs. changed" conflict, which is unhandled by StGit.
> > That is taken from git-merge-one-file resolver, but is bad, as stg
> > resolved does not handle unmerged entries (and probably it should be
> > fixed too).
>
> I think it 'stg resolved' should be fixed as well (in case there are
> unmerged entries for other reasons). My initial idea was to make
> gitmergeonefile not to leave any unmerged entries in the index. As you
> could see, there are cases where it failed.

The original patch hasn't been merged, nor (for what I see) anything else to 
fix this problem has been done.

I assume the patch was lost waiting for the discussion to settle down, but the 
patch can be merged, even changing the default choices in any way (see 
below).

Also, another note: I just found Bruce Eckel mentioning pychecker, which is a 
static code checker for Python (to perform the checks a compiler would 
normally do). I've not the time to investigate more myself, but I hope it can 
be useful to you.

> I can see the following scenarios for a file:

> 1. deleted in the base and modified by the patch. It should leave the
> file in the tree together with file.older. Another option would be to
> remove the file and leave both file.older and file.remote in the tree
> (here .remote means the version in the patch) but I would prefer the
> first one.
>
> 2. changed in the base but deleted by the patch. It should remove the
> file from the tree but leave file.older and file.local. The other
> option is to leave the file in the tree but, as above, I prefer the
> first one.
>
> Maybe StGIT should try to track the renaming as well but I haven't
> played with this feature in GIT at all.

-- 
Inform me of my mistakes, so I can keep imitating Homer Simpson's "Doh!".
Paolo Giarrusso, aka Blaisorblade (Skype ID "PaoloGiarrusso", ICQ 215621894)
http://www.user-mode-linux.org/~blaisorblade

	

	
		
___________________________________ 
Yahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB 
http://mail.yahoo.it
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]