Commit 8d53b1ef05a45604d76b2cf80094f688edf15b44

[Hugo Trippaers <HT...@schubergphilis.com>]

Nitin,

Can you please fix your commit with id 8d53b1ef05a45604d76b2cf80094f688edf15b44

You committed a file with conflicts (docs/en-US/gslb.xml) and it's breaking the docs build.


Cheers,

Hugo

RE: Commit 8d53b1ef05a45604d76b2cf80094f688edf15b44

[Hugo Trippaers <HT...@schubergphilis.com>]

> -----Original Message-----
> From: Chip Childers [mailto:chip.childers@sungard.com]
> Sent: Monday, May 13, 2013 6:07 PM
> To: dev@cloudstack.apache.org
> Cc: nitin@apache.org
> Subject: Re: Commit 8d53b1ef05a45604d76b2cf80094f688edf15b44
> 
> On Mon, May 13, 2013 at 03:54:51PM +0000, Nitin Mehta wrote:
> > David - It seems like I messed up my merge here. It wasn't done as a
> > single commit and therefore the difficulty of reverting it back.
> > Would you have any suggestions to revert it here ?
> 
> AFAIK, you need to go through and revert all relevant commits.  I'd do it
> sooner rather than later too...  so that it's not harder.
> 
> I may be wrong though...
> 

This is a nice write up of the evilness of reverting merges: http://opensource.apple.com/source/Git/Git-26/src/git-htmldocs/howto/revert-a-faulty-merge.txt

You can technically use the revert -m on the merge commit. But you have to take some steps in the future if you want to merge that same (fixed) merge again.


Cheers,

Hugo


> >
> > On 13/05/13 8:52 PM, "David Nalley" <da...@gnsa.us> wrote:
> >
> > >Speaking of, I saw lots of stuff in that merge that didn't appear to
> > >be related to your merge. I am concerned that it effectively reverted
> > >a number of things.
> > >
> > >--David
> > >
> > >On Mon, May 13, 2013 at 11:07 AM, Nitin Mehta
> > ><Ni...@citrix.com>
> > >wrote:
> > >> Sure. Looking into it.
> > >>
> > >> On 13/05/13 8:14 PM, "Hugo Trippaers"
> > >> <HT...@schubergphilis.com>
> > >> wrote:
> > >>
> > >>>Nitin,
> > >>>
> > >>>Can you please fix your commit with id
> > >>>8d53b1ef05a45604d76b2cf80094f688edf15b44
> > >>>
> > >>>You committed a file with conflicts (docs/en-US/gslb.xml) and it's
> > >>>breaking the docs build.
> > >>>
> > >>>
> > >>>Cheers,
> > >>>
> > >>>Hugo
> > >>
> >
> >

Re: Commit 8d53b1ef05a45604d76b2cf80094f688edf15b44

[Chip Childers <ch...@sungard.com>]

On Mon, May 13, 2013 at 03:54:51PM +0000, Nitin Mehta wrote:
> David - It seems like I messed up my merge here. It wasn't done as a
> single commit and therefore the difficulty of reverting it back.
> Would you have any suggestions to revert it here ?

AFAIK, you need to go through and revert all relevant commits.  I'd do
it sooner rather than later too...  so that it's not harder.

I may be wrong though...  

> 
> On 13/05/13 8:52 PM, "David Nalley" <da...@gnsa.us> wrote:
> 
> >Speaking of, I saw lots of stuff in that merge that didn't appear to
> >be related to your merge. I am concerned that it effectively reverted
> >a number of things.
> >
> >--David
> >
> >On Mon, May 13, 2013 at 11:07 AM, Nitin Mehta <Ni...@citrix.com>
> >wrote:
> >> Sure. Looking into it.
> >>
> >> On 13/05/13 8:14 PM, "Hugo Trippaers" <HT...@schubergphilis.com>
> >> wrote:
> >>
> >>>Nitin,
> >>>
> >>>Can you please fix your commit with id
> >>>8d53b1ef05a45604d76b2cf80094f688edf15b44
> >>>
> >>>You committed a file with conflicts (docs/en-US/gslb.xml) and it's
> >>>breaking the docs build.
> >>>
> >>>
> >>>Cheers,
> >>>
> >>>Hugo
> >>
> 
> 

Re: Commit 8d53b1ef05a45604d76b2cf80094f688edf15b44

[Nitin Mehta <Ni...@citrix.com>]

On 13/05/13 9:48 PM, "David Nalley" <da...@gnsa.us> wrote:

>Hi Nitin:
>
>Go through and see what changed that you didn't intend - and revert
>those individual commits.


David - I googled a bit more and read on this. From my reading it seems
that the flow I followed doesn't harm the branch from code perspective. So
no harm done in terms of code being lost.
The only issue could be that a bit of history being jumbled in terms of
parents.
Reverting my commits would be more trickier and can be more difficult
given the size. I also discussed this with one of my friends explaining
him this flow and he backed my findings as well.

I had done sanity testing after pushing the code and that worked fine. The
doc file (which Hugo pointed to) I had mistakenly added without resolving
the conflicts which I will shortly fix.
If anyone sees any other issues with this do let me know.



>I'd like to understand what happened though - did you rebase your
>branch before the merge??
>
>--David
>
>On Mon, May 13, 2013 at 11:54 AM, Nitin Mehta <Ni...@citrix.com>
>wrote:
>> David - It seems like I messed up my merge here. It wasn't done as a
>> single commit and therefore the difficulty of reverting it back.
>> Would you have any suggestions to revert it here ?
>>
>> On 13/05/13 8:52 PM, "David Nalley" <da...@gnsa.us> wrote:
>>
>>>Speaking of, I saw lots of stuff in that merge that didn't appear to
>>>be related to your merge. I am concerned that it effectively reverted
>>>a number of things.
>>>
>>>--David
>>>
>>>On Mon, May 13, 2013 at 11:07 AM, Nitin Mehta <Ni...@citrix.com>
>>>wrote:
>>>> Sure. Looking into it.
>>>>
>>>> On 13/05/13 8:14 PM, "Hugo Trippaers" <HT...@schubergphilis.com>
>>>> wrote:
>>>>
>>>>>Nitin,
>>>>>
>>>>>Can you please fix your commit with id
>>>>>8d53b1ef05a45604d76b2cf80094f688edf15b44
>>>>>
>>>>>You committed a file with conflicts (docs/en-US/gslb.xml) and it's
>>>>>breaking the docs build.
>>>>>
>>>>>
>>>>>Cheers,
>>>>>
>>>>>Hugo
>>>>
>>

Re: Commit 8d53b1ef05a45604d76b2cf80094f688edf15b44

[Nitin Mehta <Ni...@citrix.com>]

David - I followed the following flow below. I had done the same earlier
as well except that I had squashed the changes into 1 commit.


git checkout -b develop
...make some changes...
...notice master has been updated...
...commit changes to develop...
git checkout master
git pull
...bring those changes back into develop...
git checkout develop
git merge master
...make some more changes...
...commit them to develop...
...merge them into master...
git checkout master
git pull
git merge develop






On 13/05/13 9:48 PM, "David Nalley" <da...@gnsa.us> wrote:

>Hi Nitin:
>
>Go through and see what changed that you didn't intend - and revert
>those individual commits.
>I'd like to understand what happened though - did you rebase your
>branch before the merge??
>
>--David
>
>On Mon, May 13, 2013 at 11:54 AM, Nitin Mehta <Ni...@citrix.com>
>wrote:
>> David - It seems like I messed up my merge here. It wasn't done as a
>> single commit and therefore the difficulty of reverting it back.
>> Would you have any suggestions to revert it here ?
>>
>> On 13/05/13 8:52 PM, "David Nalley" <da...@gnsa.us> wrote:
>>
>>>Speaking of, I saw lots of stuff in that merge that didn't appear to
>>>be related to your merge. I am concerned that it effectively reverted
>>>a number of things.
>>>
>>>--David
>>>
>>>On Mon, May 13, 2013 at 11:07 AM, Nitin Mehta <Ni...@citrix.com>
>>>wrote:
>>>> Sure. Looking into it.
>>>>
>>>> On 13/05/13 8:14 PM, "Hugo Trippaers" <HT...@schubergphilis.com>
>>>> wrote:
>>>>
>>>>>Nitin,
>>>>>
>>>>>Can you please fix your commit with id
>>>>>8d53b1ef05a45604d76b2cf80094f688edf15b44
>>>>>
>>>>>You committed a file with conflicts (docs/en-US/gslb.xml) and it's
>>>>>breaking the docs build.
>>>>>
>>>>>
>>>>>Cheers,
>>>>>
>>>>>Hugo
>>>>
>>

Re: Commit 8d53b1ef05a45604d76b2cf80094f688edf15b44

[David Nalley <da...@gnsa.us>]

Hi Nitin:

Go through and see what changed that you didn't intend - and revert
those individual commits.
I'd like to understand what happened though - did you rebase your
branch before the merge??

--David

On Mon, May 13, 2013 at 11:54 AM, Nitin Mehta <Ni...@citrix.com> wrote:
> David - It seems like I messed up my merge here. It wasn't done as a
> single commit and therefore the difficulty of reverting it back.
> Would you have any suggestions to revert it here ?
>
> On 13/05/13 8:52 PM, "David Nalley" <da...@gnsa.us> wrote:
>
>>Speaking of, I saw lots of stuff in that merge that didn't appear to
>>be related to your merge. I am concerned that it effectively reverted
>>a number of things.
>>
>>--David
>>
>>On Mon, May 13, 2013 at 11:07 AM, Nitin Mehta <Ni...@citrix.com>
>>wrote:
>>> Sure. Looking into it.
>>>
>>> On 13/05/13 8:14 PM, "Hugo Trippaers" <HT...@schubergphilis.com>
>>> wrote:
>>>
>>>>Nitin,
>>>>
>>>>Can you please fix your commit with id
>>>>8d53b1ef05a45604d76b2cf80094f688edf15b44
>>>>
>>>>You committed a file with conflicts (docs/en-US/gslb.xml) and it's
>>>>breaking the docs build.
>>>>
>>>>
>>>>Cheers,
>>>>
>>>>Hugo
>>>
>

Re: Commit 8d53b1ef05a45604d76b2cf80094f688edf15b44

[Nitin Mehta <Ni...@citrix.com>]

David - It seems like I messed up my merge here. It wasn't done as a
single commit and therefore the difficulty of reverting it back.
Would you have any suggestions to revert it here ?

On 13/05/13 8:52 PM, "David Nalley" <da...@gnsa.us> wrote:

>Speaking of, I saw lots of stuff in that merge that didn't appear to
>be related to your merge. I am concerned that it effectively reverted
>a number of things.
>
>--David
>
>On Mon, May 13, 2013 at 11:07 AM, Nitin Mehta <Ni...@citrix.com>
>wrote:
>> Sure. Looking into it.
>>
>> On 13/05/13 8:14 PM, "Hugo Trippaers" <HT...@schubergphilis.com>
>> wrote:
>>
>>>Nitin,
>>>
>>>Can you please fix your commit with id
>>>8d53b1ef05a45604d76b2cf80094f688edf15b44
>>>
>>>You committed a file with conflicts (docs/en-US/gslb.xml) and it's
>>>breaking the docs build.
>>>
>>>
>>>Cheers,
>>>
>>>Hugo
>>

Re: Commit 8d53b1ef05a45604d76b2cf80094f688edf15b44

[David Nalley <da...@gnsa.us>]

Speaking of, I saw lots of stuff in that merge that didn't appear to
be related to your merge. I am concerned that it effectively reverted
a number of things.

--David

On Mon, May 13, 2013 at 11:07 AM, Nitin Mehta <Ni...@citrix.com> wrote:
> Sure. Looking into it.
>
> On 13/05/13 8:14 PM, "Hugo Trippaers" <HT...@schubergphilis.com>
> wrote:
>
>>Nitin,
>>
>>Can you please fix your commit with id
>>8d53b1ef05a45604d76b2cf80094f688edf15b44
>>
>>You committed a file with conflicts (docs/en-US/gslb.xml) and it's
>>breaking the docs build.
>>
>>
>>Cheers,
>>
>>Hugo
>

Re: Commit 8d53b1ef05a45604d76b2cf80094f688edf15b44

[Nitin Mehta <Ni...@citrix.com>]

Sure. Looking into it.

On 13/05/13 8:14 PM, "Hugo Trippaers" <HT...@schubergphilis.com>
wrote:

>Nitin,
>
>Can you please fix your commit with id
>8d53b1ef05a45604d76b2cf80094f688edf15b44
>
>You committed a file with conflicts (docs/en-US/gslb.xml) and it's
>breaking the docs build.
>
>
>Cheers,
>
>Hugo