On Jul 6, 2018, at 1:02 PM, Warren Young war...@etr-usa.com wrote:
> Here’s my best-effort attempt at recreating what the OP described:
>
>https://imgur.com/a/6S4Y1nw
>
> You either end up with two trunk branches or a single branch plus a checkin
> off
> the trunk branch that also happens t
On Jul 5, 2018, at 12:22 PM, Nicola wrote:
>
> moving check-ins between branches is implemented by simply renaming tags.
It’s better to say that you can move a checkin *and all of its children* by
adding/changing a propagating tag to that checkin. In Fossil UI, this is the
"Make this check-in
On 04/07/2018 16:42, jungle Boogie wrote:
On 12:42AM, Wed, Jul 4, 2018 Nicola
> Maybe, the sentence above could be complemented with an example of how
> to do that and how *not* to do it (e.g., explaining what the effect of
> adding a 'trunk' tag to a random check-in is and why it should not
On Jul 4, 2018, at 9:50 AM, Dewey Hylton wrote:
>
> The solution ended up being much less messy than I anticipated
Yes; while Fossil will let you create awful messes, this is mitigated by
several design choices:
1. It’s really hard to make Fossil actually lose data. It can be done, but it
ta
On Tue, Jul 3, 2018 at 8:57 PM Richard Hipp wrote:
> On 7/3/18, Dewey Hylton wrote:
>
> > Essentially what I did was to commit a change to a new branch, forget I
> was
> > in that branch and committed another unrelated change which should have
> > gone back to trunk but went into the branch.
>
>
On 12:42AM, Wed, Jul 4, 2018 Nicola wrote:
>
> On 04/07/2018 00:18, Warren Young wrote:> On Jul 3, 2018, at 3:09 PM,
> Dewey Hylton wrote:
>
> >> I then attempted to change that latest commit by adding a 'trunk'
> tag and cancelling the new branch tag.
> >
> > Ow!
> As a newbie Fossil user, af
El mié., 4 jul. 2018 a las 4:42, Nicola () escribió:
> Maybe, the sentence above could be complemented with an example of how
> to do that and how *not* to do it (e.g., explaining what the effect of
> adding a 'trunk' tag to a random check-in is and why it should not be
> done).
>
+1
___
On 04/07/2018 00:18, Warren Young wrote:> On Jul 3, 2018, at 3:09 PM,
Dewey Hylton wrote:
>> I then attempted to change that latest commit by adding a 'trunk'
tag and cancelling the new branch tag.
>
> Ow!
As a newbie Fossil user, after reading
https://www.fossil-scm.org/index.html/doc/t
On 7/3/18, Dewey Hylton wrote:
> Essentially what I did was to commit a change to a new branch, forget I was
> in that branch and committed another unrelated change which should have
> gone back to trunk but went into the branch.
I made that same mistake myself, recently. See
https://www.sqlite
On Jul 3, 2018, at 3:09 PM, Dewey Hylton wrote:
>
> Essentially what I did was to commit a change to a new branch, forget I was
> in that branch and committed another unrelated change which should have gone
> back to trunk but went into the branch.
That’s no big problem so far. I’ve done it m
1) See the `--cherrypick` switch to `fossil merge`.
2)
a. undo the tags you've fiddled with, so that branch=trunk is original
trunk and side-branch is branch=side-branch.
b. fossil checkout trunk
c. fossil merge --cherrypick
d. (optional) move the erroneous commit (I'm assuming the last co
On Tue, Jul 3, 2018 at 2:09 PM Dewey Hylton wrote:
> I've used fossil for years now with lots of commits to trunk and very few
> very simple branches which tend to get merged right into trunk after only a
> few commits. I have managed to get myself in a confusing place with one of
> my projects.
12 matches
Mail list logo
