Re: [BUG] Cannot push some grafted branches

2012-12-22 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 21.12.2012 17:58: Michael J Gruber g...@drmicha.warpmail.net writes: While replace refs are much more general than grafts, it seems the two main uses are: - grafts (change the recorded parents for a commit) - svn cleanup (convert tagging commits into tag

Re: [BUG] Cannot push some grafted branches

2012-12-21 Thread Michael J Gruber
While replace refs are much more general than grafts, it seems the two main uses are: - grafts (change the recorded parents for a commit) - svn cleanup (convert tagging commits into tag objects) The latter one being quite a special case already. The script below has helped me move from grafts

Re: [BUG] Cannot push some grafted branches

2012-12-21 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: While replace refs are much more general than grafts, it seems the two main uses are: - grafts (change the recorded parents for a commit) - svn cleanup (convert tagging commits into tag objects) The latter one being quite a special case

Re: [BUG] Cannot push some grafted branches

2012-12-19 Thread Yann Dirson
On Tue, 18 Dec 2012 08:09:35 -0800 Junio C Hamano gits...@pobox.com wrote: Yann Dirson dir...@bertin.fr writes: On Mon, 17 Dec 2012 13:14:56 -0800 Junio C Hamano gits...@pobox.com wrote: Andreas Schwab sch...@linux-m68k.org writes: Christian Couder christian.cou...@gmail.com

Re: [BUG] Cannot push some grafted branches

2012-12-19 Thread Jeff King
On Wed, Dec 19, 2012 at 08:13:21AM +0100, Johannes Sixt wrote: Am 12/18/2012 17:24, schrieb Jeff King: I am not really interested in pushing this forward myself, but I worked up this toy that somebody might find interesting (you can git replace HEAD~20 to get dumped in an editor). It

Re: [BUG] Cannot push some grafted branches

2012-12-19 Thread Thomas Rast
Junio C Hamano gits...@pobox.com writes: I do not understand why you even want to go in the harder route in the first place, only to complicate things? All you want to do is to craft a commit object that records a specific tree shape, has a set of parents you want, and has the log

Re: [BUG] Cannot push some grafted branches

2012-12-19 Thread Junio C Hamano
Thomas Rast tr...@student.ethz.ch writes: I still wouldn't recommend this approach in git-replace(1) for several reasons: * It does not generalize in any direction. For each field you may want to change, you have to know a _specific_ way of getting just the commit you want. * More to

Re: [BUG] Cannot push some grafted branches

2012-12-18 Thread Yann Dirson
On Mon, 17 Dec 2012 13:14:56 -0800 Junio C Hamano gits...@pobox.com wrote: Andreas Schwab sch...@linux-m68k.org writes: Christian Couder christian.cou...@gmail.com writes: Yeah, at one point I wanted to have a command that created to craft a new commit based on an existing one.

Re: [BUG] Cannot push some grafted branches

2012-12-18 Thread Johannes Sixt
Am 12/18/2012 12:00, schrieb Yann Dirson: On Mon, 17 Dec 2012 13:14:56 -0800 Junio C Hamano gits...@pobox.com wrote: Andreas Schwab sch...@linux-m68k.org writes: Christian Couder christian.cou...@gmail.com writes: Yeah, at one point I wanted to have a command that created to craft a new

Re: [BUG] Cannot push some grafted branches

2012-12-18 Thread Thomas Rast
Johannes Sixt j.s...@viscovery.net writes: Am 12/18/2012 12:00, schrieb Yann Dirson: On Mon, 17 Dec 2012 13:14:56 -0800 Junio C Hamano gits...@pobox.com wrote: Andreas Schwab sch...@linux-m68k.org writes: Christian Couder christian.cou...@gmail.com writes: Yeah, at one point I wanted to

Re: [BUG] Cannot push some grafted branches

2012-12-18 Thread Thomas Rast
Yann Dirson dir...@bertin.fr writes: +EXAMPLE +--- + +Replacements (and before them, grafts) are often used to replace the +parent list of a commit. Since commits are stored in a human-readable +format, you can in fact change any property using the following +recipe: +

Re: [BUG] Cannot push some grafted branches

2012-12-18 Thread Jeff King
On Tue, Dec 18, 2012 at 02:41:57PM +0100, Yann Dirson wrote: I wouldn't even want a script -- we'd end up inventing a complicated command-line editor for what can simply be done by judicious use of an actual text editor. How about something like the following? Well, while it does the

Re: [BUG] Cannot push some grafted branches

2012-12-18 Thread Johannes Sixt
Am 12/18/2012 17:24, schrieb Jeff King: I am not really interested in pushing this forward myself, but I worked up this toy that somebody might find interesting (you can git replace HEAD~20 to get dumped in an editor). It should probably handle trees, and it would probably make sense to do

Re: [BUG] Cannot push some grafted branches

2012-12-17 Thread Thomas Rast
Junio C Hamano gits...@pobox.com writes: Yann Dirson dir...@bertin.fr writes: In this respect, they seem to be lacking a few features, when compared to replace refs, but they have different uses, ... Not reallyl; grafts were old hack whose use is still supported with its original

Re: [BUG] Cannot push some grafted branches

2012-12-17 Thread Junio C Hamano
Yann Dirson dir...@bertin.fr writes: And we may still want the bug fixed, or would we just list it as a known bug ? At least it does not seem to occur with replace refs: The replace was designed to fix known limitation of grafts, which is _inherent_ to it; the graft information was designed

Re: [BUG] Cannot push some grafted branches

2012-12-17 Thread Yann Dirson
On Mon, 17 Dec 2012 00:56:06 -0800 Junio C Hamano gits...@pobox.com wrote: Yann Dirson dir...@bertin.fr writes: And we may still want the bug fixed, or would we just list it as a known bug ? At least it does not seem to occur with replace refs: The replace was designed to fix known

Re: [BUG] Cannot push some grafted branches

2012-12-17 Thread Junio C Hamano
Andreas Schwab sch...@linux-m68k.org writes: Christian Couder christian.cou...@gmail.com writes: Yeah, at one point I wanted to have a command that created to craft a new commit based on an existing one. This isn't hard to do, you only have to resort to plumbing: $ git cat-file commit

Re: [BUG] Cannot push some grafted branches

2012-12-16 Thread Yann Dirson
On Wed, 12 Dec 2012 11:57:47 -0800 Junio C Hamano gits...@pobox.com wrote: Yann Dirson dir...@bertin.fr writes: In this respect, they seem to be lacking a few features, when compared to replace refs, but they have different uses, ... Not reallyl; grafts were old hack whose

Re: [BUG] Cannot push some grafted branches

2012-12-12 Thread Yann Dirson
On Tue, 11 Dec 2012 10:15:23 -0800 Junio C Hamano gits...@pobox.com wrote: Yann Dirson dir...@bertin.fr writes: There seems to be some bad interactions between git-push and grafts. The problem seems to occur when a commit that exists in the remote repo is subject to a graft in the local

Re: [BUG] Cannot push some grafted branches

2012-12-12 Thread Yann Dirson
On Wed, 12 Dec 2012 09:44:32 +0100 Yann Dirson dir...@bertin.fr wrote: In fact, I even looked for a way to specify an alternate (or supplementary) grafts file for this drafting work, so only well-controlled git invocations would see them, whereas the others would just ignore them, and could not

Re: [BUG] Cannot push some grafted branches

2012-12-12 Thread Junio C Hamano
Yann Dirson dir...@bertin.fr writes: In this respect, they seem to be lacking a few features, when compared to replace refs, but they have different uses, ... Not reallyl; grafts were old hack whose use is still supported with its original limitations; replace is meant to replace all

Re: [BUG] Cannot push some grafted branches

2012-12-11 Thread Junio C Hamano
Yann Dirson dir...@bertin.fr writes: There seems to be some bad interactions between git-push and grafts. The problem seems to occur when a commit that exists in the remote repo is subject to a graft in the local repo, and we try to push one of the fake parents. History tweaking by grafts is