Re: Stacked GIT 0.3 (now more Quilt-like)

Catalin Marinas [EMAIL PROTECTED] writes: On Sun, 2005-07-03 at 14:38 +0200, Peter Osterlund wrote: Catalin Marinas [EMAIL PROTECTED] writes: I know that using -A gives a more detailed output in case of a conflict. The problem is that you will get a conflict even if the changes

Re: Stacked GIT 0.3 (now more Quilt-like)

-off-by: Peter Osterlund [EMAIL PROTECTED] --- b/stgit/git.py | 22 ++ b/stgit/main.py |2 ++ 2 files changed, 24 insertions(+) diff --git a/stgit/git.py b/stgit/git.py --- a/stgit/git.py +++ b/stgit/git.py @@ -345,6 +345,28 @@ def diff(files = [], rev1 = 'HEAD', rev2

Re: Stacked GIT 0.3 (now more Quilt-like)

Junio C Hamano [EMAIL PROTECTED] writes: PO == Peter Osterlund [EMAIL PROTECTED] writes: PO I think it would be good if it was possible to include diffstat output PO in exported patches, something like this: PO Added possibility to include diffstat output in exported patches. And you

[PATCH] stgit: Handle 'A' flag for new files

Hi, Patches that add new files don't work correctly if git reports them with the 'A' flag. StGIT claims there are unresolved conflicts. This patch fixes it. Signed-off-by: Peter Osterlund [EMAIL PROTECTED] diff --git a/stgit/git.py b/stgit/git.py --- a/stgit/git.py +++ b/stgit/git.py @@ -274,7

Re: Fix interesting git-rev-list corner case

/sys.c. Removing net/ipv4/utils.c Removing sound/pcmcia/vx/vx_entry.c Removing sound/pcmcia/vx/vxp440.c fatal: merge program failed Automatic merge failed, fix up by hand -- Peter Osterlund - [EMAIL PROTECTED] http://web.telia.com/~u89404340 - To unsubscribe from this list: send the line unsubscribe

Re: Fix interesting git-rev-list corner case

Linus Torvalds [EMAIL PROTECTED] writes: On Sat, 30 Jul 2005, Peter Osterlund wrote: I have problems pulling linux kernel changes from 33ac02aa4cef417871e128ab4a6565e751e5f3b2 to b0825488a642cadcf39709961dde61440cb0731c into my local tree. At first I thought your patch would fix

Re: Fix interesting git-rev-list corner case

On Sat, 30 Jul 2005, Linus Torvalds wrote: On Sat, 30 Jul 2005, Peter Osterlund wrote: OK, but note that I didn't do any editing of any local files myself. Both commit ids are from your public linux kernel git tree. What I did was equivalent to: 1. rsync from rsync.kernel.org/pub

Re: Fix interesting git-rev-list corner case

there is a smarter way to do this, but this _should_ fix the problem Peter sees. Peter? Yes, it does fix the problem. Thanks. -- Peter Osterlund - [EMAIL PROTECTED] http://web.telia.com/~u89404340 - To unsubscribe from this list: send the line unsubscribe git in the body of a message to [EMAIL PROTECTED