[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: adapting changesets without starting over
From: |
Jordi Gutiérrez Hermoso |
Subject: |
Re: adapting changesets without starting over |
Date: |
Sat, 27 Aug 2011 14:42:36 -0500 |
2011/8/27 c. <address@hidden>:
>
> On 27 Aug 2011, at 21:02, Jordi Gutiérrez Hermoso wrote:
>
>> 2011/8/27 c. <address@hidden>:
>>>
>>> On 27 Aug 2011, at 18:17, Jordi Gutiérrez Hermoso wrote:
>>>
>>> I did
>>>
>>>> hg qimport
>>>> hg qpush
>>>> hg qrefresh -e
>>>
>>> then exported the changeset, and the result is attached, does it
>>> look correct?
>>
>> It looks like you concatenated the same patch twice, with different
>> commit messages. You only need one of those.
>
> that was produced by exactly the sequence of commands shown above,
> followed by
>
> hg export -o bicg4.changeset tip
>
> any idea what could have gone wrong?
Looks like export concatenates to an existing filename instead of
overwriting it. I would have done this instead:
hg export tip > bicg4.diff
> At the moment, though, the approach of just manually editing the
> changeset file looks very attractive.
Well, what I suggested isn't to avoid editing the changeset, but to
place it at a different place in the DAG (directed acyclic graph, the
history).
But do whatever feels comfortable. I'm only offering what I think are
the most common workflows.
- Jordi G. H.
- adapting changesets without starting over, Carlo de Falco, 2011/08/27
- Re: adapting changesets without starting over, Ben Abbott, 2011/08/27
- Re: adapting changesets without starting over, Jordi Gutiérrez Hermoso, 2011/08/27
- Re: adapting changesets without starting over, c., 2011/08/27
- Re: adapting changesets without starting over, Jordi Gutiérrez Hermoso, 2011/08/27
- Re: adapting changesets without starting over, c., 2011/08/27
- Re: adapting changesets without starting over,
Jordi Gutiérrez Hermoso <=
- Re: adapting changesets without starting over, c., 2011/08/27
- Re: adapting changesets without starting over, Jordi Gutiérrez Hermoso, 2011/08/27
- Re: adapting changesets without starting over, c., 2011/08/27
- Re: adapting changesets without starting over, Carlo de Falco, 2011/08/28
- Re: adapting changesets without starting over, Jordi Gutiérrez Hermoso, 2011/08/28
- Re: adapting changesets without starting over, Ben Abbott, 2011/08/27
Re: adapting changesets without starting over, c., 2011/08/27