On Fri, 17 Apr 2015 06:56:13 +0200, Andy Bradford
amb-fos...@bradfords.org wrote:
Thus said Scott Robison on Thu, 16 Apr 2015 21:00:50 -0600:
Partly I think it is because your test case consists of a single file
of a single line, which means probably (I would think) every merge
Hi,
This is probably a trivial question, but I can't find a clear answer
in the documentation.
I have a repository at
http://kuu.se/fossil/b64.cgi/timeline
with two branches, trunk and c-stdin
In c-stdin, I created the file b64.c, which does not exist in trunk.
Some other files, created
On Apr 16, 2015, at 10:47 AM, Johan Kuuse jo...@kuu.se wrote:
In c-stdin, I created the file b64.c
That’s not what this says:
http://kuu.se/fossil/b64.cgi/finfo?name=b64.c
I’ve done what you claim to have attempted, and if you had actually done this,
you would have seen something like
On Apr 16, 2015, at 2:44 PM, Warren Young w...@etr-usa.com wrote:
On Apr 16, 2015, at 10:47 AM, Johan Kuuse jo...@kuu.se wrote:
In c-stdin, I created the file b64.c
That’s not what this says:
Also, notice that the checkin that claims to have created b64.c actually
modifies the copy
Thus said Scott Robison on Thu, 16 Apr 2015 16:36:59 -0600:
It is by design. Merging isn't always intuitive, and certainly there could
be a bug in it.
Perhaps like this one:
http://fossil.bradfords.org:8080/info/b1e9974a37c648fe
Why was that merge essentially a no-op?
I'm confused...
Thus said Scott Robison on Thu, 16 Apr 2015 21:00:50 -0600:
Partly I think it is because your test case consists of a single file
of a single line, which means probably (I would think) every merge
resulted in a conflict that you had to resolve manually.
Yes, every merge is a conflict
On Thu, Apr 16, 2015 at 8:15 PM, Andy Bradford amb-fos...@bradfords.org
wrote:
Thus said Scott Robison on Thu, 16 Apr 2015 16:36:59 -0600:
It is by design. Merging isn't always intuitive, and certainly there
could
be a bug in it.
Perhaps like this one:
discussion
Reply To: Fossil SCM user's discussion
Subject: Re: [fossil-users] Merge - including files from other branches -
best practice?
On Apr 16, 2015, at 2:44 PM, Warren Young w...@etr-usa.com wrote:
On Apr 16, 2015, at 10:47 AM, Johan Kuuse jo...@kuu.se wrote:
In c-stdin, I
8 matches
Mail list logo
