True, it has no context for the rename of the new files. Git does not
understand the rename of the directories, just the files.
Maybe I should just switch that back to using the original directory names.
On Thursday, November 11, 2010, at 05:18 am, Strong Liu wrote:
> On Nov 2, 2010, at 5:02 AM
On Nov 2, 2010, at 5:02 AM, Steve Ebersole wrote:
> This morning I had a bug fix from an IRC discussion and decided to use it to
> try this stuff out. I chose to work on this on a topic branch created from
> master. I ran into worse trouble than you had :)
>
> About 6 hours on #git helped me
Right, that's cause there's the maven to gradle move as well in this case.
On Nov 5, 2010, at 5:17 PM, Adam Warski wrote:
> I tried cherry picking, doesn't work because the module rename (envers ->
> hibernate-envers) isn't detected.
> I'll try Steve's way with the next pull request.
>
> Adam
>
I tried cherry picking, doesn't work because the module rename (envers ->
hibernate-envers) isn't detected.
I'll try Steve's way with the next pull request.
Adam
On Nov 5, 2010, at 1:45 PM, Galder Zamarreño wrote:
> Also, would not cherry pick work for you?
>
> On Nov 5, 2010, at 1:30 PM, Gald
Well one branches off of master. The other branches off of 3.6
On Friday, November 05, 2010, at 07:30 am, Galder Zamarreño wrote:
> Why do you need two branches? HHH-5706-lob-offset and
> HHH-5706-lob-offset-backport?
>
> Why not have a single topic branch, HHH-5706-lob-offset, and merge it to
>
It could. It depends on the number of commits cherry picking would require
you to cherry pick each commit (or range of) iiuc.
Feel free to use whatever you want. People have explicitly asked me to give
them just "THIS is the way to do it" rather than "well here are the multiple
ways you could
Also, would not cherry pick work for you?
On Nov 5, 2010, at 1:30 PM, Galder Zamarreño wrote:
> Why do you need two branches? HHH-5706-lob-offset and
> HHH-5706-lob-offset-backport?
>
> Why not have a single topic branch, HHH-5706-lob-offset, and merge it to both
> 3.6 and master?
>
> On Nov
Why do you need two branches? HHH-5706-lob-offset and
HHH-5706-lob-offset-backport?
Why not have a single topic branch, HHH-5706-lob-offset, and merge it to both
3.6 and master?
On Nov 1, 2010, at 10:02 PM, Steve Ebersole wrote:
> This morning I had a bug fix from an IRC discussion and decided
This morning I had a bug fix from an IRC discussion and decided to use it to
try this stuff out. I chose to work on this on a topic branch created from
master. I ran into worse trouble than you had :)
About 6 hours on #git helped me get a working answer, though not any better
understanding.
I'll report the first time I'll have to do that.
Adam
On Oct 29, 2010, at 8:11 PM, Steve Ebersole wrote:
> Curious what happens if you go the other direction (imho the more natural
> direction)? Working from master to the 3.6 branch...
>
>
> On Friday, October 29, 2010, at 01:02 pm, Adam War
Curious what happens if you go the other direction (imho the more natural
direction)? Working from master to the 3.6 branch...
On Friday, October 29, 2010, at 01:02 pm, Adam Warski wrote:
> After some tries, here's my workflow for applying commits from the 3.6
> branch to the master branch: 1.
After some tries, here's my workflow for applying commits from the 3.6 branch
to the master branch:
1. Commit to 3.6 :)
2. Create patches for the commits using git format-patch commit sha/range etc.
This will produce numbered patches.
3. Switch to master
4. Modify the patches using the following
12 matches
Mail list logo
