On Wed, Jun 4, 2014 at 12:07 AM, Andy Bradford amb-fos...@bradfords.org
wrote:
Thus said Andy Bradford on Tue, 03 Jun 2014 21:59:21 -0600:
Does the Q-card here not imply any relation with c14a4a93d5a3 which will
be picked up in trunk?
It seems I did not understand this very well:
A
Thus said Richard Hipp on Wed, 04 Jun 2014 07:47:43 -0400:
The merge logic in Fossil recognizes when the same exact change is
merged more than once and avoids conflicts in that case. The Q-cards
are not necessary for this.
What am I doing wrong then? In this case, I did a
On Wed, Jun 4, 2014 at 1:42 PM, Andy Bradford amb-fos...@bradfords.org
wrote:
Thus said Richard Hipp on Wed, 04 Jun 2014 07:47:43 -0400:
The merge logic in Fossil recognizes when the same exact change is
merged more than once and avoids conflicts in that case. The Q-cards
are not
Hello,
While experimenting with --cherrypick I stumbled upon this situation:
$ fossil merge trunk
cannot find a common ancestor between the current checkout and trunk
$ f stat | grep checkout
checkout: 738e72e3d9cfe5568c94940c09ada1b78341ac68 2014-06-04 03:48:59 UTC
$ fossil artifact
Thus said Andy Bradford on Tue, 03 Jun 2014 21:59:21 -0600:
Does the Q-card here not imply any relation with c14a4a93d5a3 which will
be picked up in trunk?
It seems I did not understand this very well:
A Q-card is similar to a P-card in that it defines a predecessor
to the current
5 matches
Mail list logo
