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 Common Repository_
*Common Repository*
Ticket: #1
Status: Resolved
*Dev Repository*
Ticket: #1
Status: Resolved
*My Repository*
Ticket: #1
Status: Open
_Step3: I as Project Manager mark ticket as for review_
*Common Repository*
Ticket: #1
Status: Resolved
*Dev Repository*
Ticket: #1
Status: Resolved
*My Repository*
Ticket: #1
Status: For Review
_Step4: I try to push my changes to Common Repository_
SCM should warn me there is new update to ticket and show me side by side
ticket from Common Repository on left and ticket from My Repository on right
with checks which value to accept as resolution (or possibility for entering
new one over both), in case of CLI some kind of interactive prompts or plain
text editor with something like this:
# Conflict in ticket: #1
# Lines marked with * are in conflict: Left side of “|” are “their” version,
right side of “|” is “your” version. Please remove incorrect values and “I” and
leave the correct value, save file and quit editor.
*Status: Resolved | For Review
Priority:
Severity: Normal
Assigned: jnovak
Component: Core
I know it’s a lot of work, but people wouldn’t be really happy if once resolved
ticket would be marked for review because that change (marking it for review)
was submitted just later…
--
Richard Bukovansky
On 16. 03. 2017, 13:50, "fossil-users on behalf of Richard Hipp"
<fossil-users-boun...@lists.fossil-scm.org on behalf of d...@sqlite.org> wrote:
On 3/16/17, Richard Bukovansky <richard.bukovan...@gmail.com> 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 mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
