Hello,
In order to figure out how to do conflict resolution with fossil, I
created a new repository 'central', I added a file to it, then cloned
the repository into 'clone1' and 'clone2'. I switched off autosync
from all three repositories, then I modified the the same line in
central, clone1
All,
Since this is my first post, I would like to say how much I like Fossil. I
discovered Fossil about 4 month ago, did some initial testing and recommended
it for use on our many small projects. It is now used on 6 different projects.
The other day one of our developers accidentally checked
On Fri, Mar 4, 2011 at 5:58 AM, Jan Danielsson
jan.m.daniels...@gmail.com wrote:
Hello,
In order to figure out how to do conflict resolution with fossil, I
created a new repository 'central', I added a file to it, then cloned
the repository into 'clone1' and 'clone2'. I switched off
I'm sure someone else asked this recently.
http://wiki.eclipse.org/Mylyn_Integrator_Reference#Use_Cases has an
appropriate set of actions
my take:
1. each ticket to have an unique URL and retrieve ticket attribute(s) by
ID. Done! e.g.
Some logo ideas:
t-rex 'Exciting!'
http://t1.gstatic.com/images?q=tbn:ANd9GcQeEF1HR0h6BpVnOpRq3wMhFl9DOkh2j7nA7VzALlWdDqstpI68EA
Ammonite pyritized - the repository (and ammonite) are stone, but grow
over time. (though the ammonite is much more beautiful)
On Fri, Mar 4, 2011 at 1:22 PM, Martin Gagnon eme...@gmail.com wrote:
On Fri, Mar 4, 2011 at 5:58 AM, Jan Danielsson
jan.m.daniels...@gmail.com wrote:
Hello,
In order to figure out how to do conflict resolution with fossil, I
created a new repository 'central', I added a file to it, then
On Fri, Mar 4, 2011 at 7:05 AM, Anthony Jefferson ac_jeffer...@yahoo.comwrote:
All,
Since this is my first post, I would like to say how much I like Fossil. I
discovered Fossil about 4 month ago, did some initial testing and
recommended it for use on our many small projects. It is now used
Have no fear...it was shunned! Thanks for the info on individual items.
However, I did try this with just lots of smaller items to build up a large
repository. I believe it did much the same thing. I will re-test this and get
back to the group. If binary objects are checked in should they be
Several times when making merge with fossil, I ended up with really strange
conflicts like this:
BEGIN MERGE CONFLICT: original content first
include '%TargetOS%/mouse.asm'=== original content above; conflict below
=
include '%TargetOS%/mouse.asm' END MERGE CONFLICT: conflict
On Fri, Mar 04, 2011 at 06:18:11PM +0200, John Found wrote:
Several times when making merge with fossil, I ended up with really strange
conflicts like this:
BEGIN MERGE CONFLICT: original content first
include '%TargetOS%/mouse.asm'=== original content above; conflict below
On Fri, Mar 4, 2011 at 11:18 AM, John Found johnfo...@evrocom.net wrote:
Several times when making merge with fossil, I ended up with really strange
conflicts like this:
BEGIN MERGE CONFLICT: original content first
include '%TargetOS%/mouse.asm'=== original content above; conflict
Can it be a difference on the end of lines?
Hm, I don't know actually. There is small possibility that one can be with
Linux LF and other with CRLF.
Is it important? - they are text files and Fossil merges text files, not
binaries.
-- Original Message --
To:
On Fri, Mar 4, 2011 at 11:24 AM, John Found johnfo...@evrocom.net wrote:
Can it be a difference on the end of lines?
Hm, I don't know actually. There is small possibility that one can be with
Linux LF and other with CRLF.
Is it important? - they are text files and Fossil merges text files,
Did it really come out looking like that, or did the line wrapping occur
when you pasted the output in to your email program?
Not like in your response. But still strange. I posted 3 lines of text as a
example.
I will quote them again separateli, closed with [] in order to avoid mail
client
I'd go further, and say that the same change happening separately in
two branches is a conflict. Given initial content
a
b
For feature foo Bob changes it to
a
c
b
for feature bar Tom changes it to
a
c
b
When you want a branch with both features foo and bar, there isn't a
reasonable way for
On Fri, 4 Mar 2011 12:59:12 +
Stephen De Gabrielle stephen.degabrie...@acm.org wrote:
Some logo ideas:
t-rex 'Exciting!'
http://t1.gstatic.com/images?q=tbn:ANd9GcQeEF1HR0h6BpVnOpRq3wMhFl9DOkh2j7nA7VzALlWdDqstpI68EA
Um, no. Exciting is the *last* thing I want from a VCS!
In looking at
-- Original Message --
Opinions on this vary. Fossil used to ignore whitespace at the ends of
lines when merging. But I changed this just the other day in response to
a complaint:
http://www.fossil-scm.org/fossil/ci/1d93222627
So, Fossil treats CR($0d) and LF($0a) as a
I do not agree here. Of course, the solution is:
a
c
b
It follows the principle of least surprise. If you want to make very
strange things with merges, do not use a tool with automatic merge. Do
it manually.
Also, the merge of two equal lines, one with unix line end and the
other with Windows
On Fri, Mar 4, 2011 at 7:22 AM, Martin Gagnon eme...@gmail.com wrote:
I've made you test... and after I push from first clone, it give no
error at all like
there's no conflict. But when I look at the main timeline (with fossil ui)
on central, the change from first clone create a new leaf.
On Fri, Mar 04, 2011 at 01:06:46PM -0500, Ron Wilson wrote:
On Fri, Mar 4, 2011 at 7:22 AM, Martin Gagnon eme...@gmail.com wrote:
I've made you test... and after I push from first clone, it give no
error at all like
there's no conflict. But when I look at the main timeline (with fossil ui)
On Fri, Mar 4, 2011 at 1:28 PM, Joerg Sonnenberger
jo...@britannica.bec.de wrote:
On Fri, Mar 04, 2011 at 01:06:46PM -0500, Ron Wilson wrote:
On Fri, Mar 4, 2011 at 7:22 AM, Martin Gagnon eme...@gmail.com wrote:
I've made you test... and after I push from first clone, it give no
error at all
Saw this on reddit:
http://code.activestate.com/lists/tcl-core/10108/
S.
--
--
Stephen De Gabrielle
stephen.degabrie...@acm.org
Telephone +44 (0)20 85670911
Mobile+44 (0)79 85189045
http://www.degabrielle.name/stephen
___
fossil-users
I made some more tests. Located the check-ins that produced this strange merge
and checked out the versions of the problematic file from both check-ins in
order to compare them.
So, the versions of this file are completely byte-to-byte equal.
The only specificity of these files is that the last
On 4 Mar 2011, at 21:10, Stephen De Gabrielle wrote:
Saw this on reddit:
http://code.activestate.com/lists/tcl-core/10108/
Yeah, the current plan does seem to be to move to fossil. If you ask me it's
about time. Tcl was still on CVS! Problems with Sourceforget led to a desire to
look at
On Mar 4, 2011, at 19:41 , Martin Gagnon wrote:
But I think it's good to know if we just produce a fork... it might
not be an expected fork...
But usually it's not possible to tell if you're creating a fork (you have no
idea what other developers have in their private repos).
Kind
This is what I've got:
- All our project files area stored on a shared file server (Windows Server
2003)
- We have multiple clients
- Clients have one or more projects
- Clients could have multiple locations
- Projects could have one or more subprojects
- Each client/location/project/subproject
On Fri, Mar 04, 2011 at 04:27:44PM -0600, Tony Perovic wrote:
Q: How should the CGI script invoke Fossil to request these internal
resources?
The CGI is quite a defined interface, telling any query information through
environment variables, and expecting any answer in stdout.
On Friday, March 4, 2011, Remigiusz Modrzejewski l...@maxnet.org.pl wrote:
On Mar 4, 2011, at 19:41 , Martin Gagnon wrote:
But I think it's good to know if we just produce a fork... it might
not be an expected fork...
But usually it's not possible to tell if you're creating a fork (you
On Friday, March 4, 2011, Remigiusz Modrzejewski l...@maxnet.org.pl wrote:
On Mar 4, 2011, at 19:41 , Martin Gagnon wrote:
But I think it's good to know if we just produce a fork... it might
not be an expected fork...
But usually it's not possible to tell if you're creating a fork (you
29 matches
Mail list logo
