Re: [fossil-users] Conflicting edits of ticket

2017-03-16 Thread Ron W
On Thu, Mar 16, 2017 at 2:01 PM, wrote: > > Date: Thu, 16 Mar 2017 14:31:00 +0100 > From: Richard Bukovansky > Subject: Re: [fossil-users] Conflicting edits of ticket > > Some kind of “comparer” where I would be able to decide which values are > correct. > When you are

Re: [fossil-users] Conflicting edits of ticket

2017-03-16 Thread Richard Bukovansky
Some kind of “comparer” where I would be able to decide which values are correct. Example situation: _Step1: Initial state_ *Common Repository* Ticket: #1 Status: Open *Dev Repository* Ticket: #1 Status: Open *My Repository* Ticket: #1 Status: Open _Step2: Dev resolves ticket and pushes to Co

Re: [fossil-users] Conflicting edits of ticket

2017-03-16 Thread Richard Hipp
On 3/16/17, Richard Bukovansky wrote: >> If two edits change the same field, the last edit wins. > > I see. Not exactly what I was expecting, but OK. What were you expecting? Is there a better way? -- D. Richard Hipp d...@sqlite.org ___ fossil-users

Re: [fossil-users] Conflicting edits of ticket

2017-03-16 Thread Richard Bukovansky
> If two edits change the same field, the last edit wins. I see. Not exactly what I was expecting, but OK. Thank you very much. -- Richard Bukovansky ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi

Re: [fossil-users] Conflicting edits of ticket

2017-03-16 Thread Richard Hipp
On 3/16/17, Richard Bukovansky wrote: > HI, > I’m new to Fossil, but I would like to ask you, how Fossil handles > conflicting edits to tickets? > In my company we are currently looking for distributed scm&ticketing system, > but about this we are not sure. Every edit has a timestamp. The edits

[fossil-users] Conflicting edits of ticket

2017-03-16 Thread Richard Bukovansky
HI, I’m new to Fossil, but I would like to ask you, how Fossil handles conflicting edits to tickets? In my company we are currently looking for distributed scm&ticketing system, but about this we are not sure. Thank you. Regards, Richard Bukovansky