Bug 6764

Summary: mgarepo should handle better SVN conflicts
Product: Mageia Reporter: Thierry Vignaud <thierry.vignaud>
Component: RPM PackagesAssignee: Mageia Bug Squad <bugsquad>
Status: RESOLVED DUPLICATE QA Contact:
Severity: normal    
Priority: Normal CC: dan
Version: Cauldron   
Target Milestone: ---   
Hardware: All   
OS: Linux   
Whiteboard:
Source RPM: mgarepo CVE:
Status comment:

Description Thierry Vignaud 2012-07-12 12:28:29 CEST 
mgarepo should handle better SVN conflicts (usually on spec files)
It currently silently pause, waiting for user to act (usually meaning pressing "p").
It should just handle that and leave the files in conflict status.

How to reproduce:
1) locally run "mgarepo co foobar" twice in two different directories
2) bump mkrel (+1) w/o commiting in one place
3) bump mkrel (+2) _and_ commit in the second place
4) run "mgarepo up" in the first place => boom
Comment 1 Manuel Hiebel 2012-10-20 22:04:09 CEST 
boklm leave Mageia

Assignee: boklm => bugsquad

Comment 2 Dan Fandrich 2013-07-02 22:42:08 CEST 
Duplicate of bug#952

*** This bug has been marked as a duplicate of bug 952 ***

Status: NEW => RESOLVED
CC: (none) => dan
Resolution: (none) => DUPLICATE