On Wed, Aug 16, 2017 at 10:09 PM, Stephan Beal
wrote:
> It's hypothetically possible, and i investigated it 3 or 4 years ago, but
> the devil is in the details :/. Not impossible, but you have to take care
> of details like properly undelta'ing anything which is deltad
On Wed, Aug 16, 2017 at 9:59 PM, bch wrote:
> That doesn't sound unreasonable. Sort of doubly-constrained 1) from newest
> to older, per branch 2) on conflict, retarget branch, go-to 1
>
That's basically it, at least hypothetically. In principal "easy", and the
code is in
On Aug 16, 2017 12:54, "Stephan Beal" wrote:
On Wed, Aug 16, 2017 at 9:19 PM, bch wrote:
>
>
> On Aug 16, 2017 12:10, "Stephan Beal" wrote:
>
> It's hypothetically possible, and i investigated it 3 or 4 years ago, but
> the
On Wed, Aug 16, 2017 at 9:54 PM, Stephan Beal wrote:
> just a preference/habit. Thus if you pop the head, you need to make sure
> and go undelta all artifacts in that head which are not referenced by
> anything else in the tree.
>
Parson me: you'd need to undelta anything
On Wed, Aug 16, 2017 at 9:19 PM, bch wrote:
>
>
> On Aug 16, 2017 12:10, "Stephan Beal" wrote:
>
> It's hypothetically possible, and i investigated it 3 or 4 years ago, but
> the devil is in the details :/. Not impossible, but you have to take care
On Aug 16, 2017 12:10, "Stephan Beal" wrote:
It's hypothetically possible, and i investigated it 3 or 4 years ago, but
the devil is in the details :/. Not impossible, but you have to take care
of details like properly undelta'ing anything which is deltad against the
It's hypothetically possible, and i investigated it 3 or 4 years ago, but
the devil is in the details :/. Not impossible, but you have to take care
of details like properly undelta'ing anything which is deltad against the
to-be-popped head. At the time i wasn't confident enough in my knowhow of
We really should have (and it's not against philosophy) ability to
pop commits off top, though. I've miscommited to a branch, and I think
I'd just like to redo it, to say nothing of accidentally committing
something sensitive like a credit card number or password.
-bch
On 8/16/17, Stephan Beal
On Wed, Aug 16, 2017 at 8:15 PM, Stephan Beal wrote:
> On Wed, Aug 16, 2017 at 7:59 PM, Steve Schow wrote:
> > Is that possible at all or if not, what is the best way to handle that
> kind of situation with fossil?
>
> Fossil is designed to never forget
On Wed, Aug 16, 2017 at 7:59 PM, Steve Schow wrote:
> Is that possible at all or if not, what is the best way to handle that
kind of situation with fossil?
Fossil is designed to never forget anything, not even mistakes. It's
possible to move a commit to a new branch, thereby
Steve,
Usually what is done here is the incorrect commit is moved to a
different branch, which is typically hidden. This can be done using
"fossil amend". Then you update to the new head of your branch (the
previous commit) using "fossil update" and retry your commit.
It's also possible
On 8/16/17, Steve Schow wrote:
> I know the fossil paradigm generally frowns on the idea of undoing commits.
> Please tell me your thoughts about the best approach to handle the following
> situation.
>
> a few file is added to the checkout and committed. So the commit has one
I know the fossil paradigm generally frowns on the idea of undoing commits.
Please tell me your thoughts about the best approach to handle the following
situation.
a few file is added to the checkout and committed. So the commit has one new
file, nothing else. It is later determined that
13 matches
Mail list logo