Bug 6764 - mgarepo should handle better SVN conflicts
Summary: mgarepo should handle better SVN conflicts
Status: RESOLVED DUPLICATE of bug 952
Alias: None
Product: Mageia
Classification: Unclassified
Component: RPM Packages (show other bugs)
Version: Cauldron
Hardware: All Linux
Priority: Normal normal
Target Milestone: ---
Assignee: Mageia Bug Squad
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-07-12 12:28 CEST by Thierry Vignaud
Modified: 2013-07-02 22:42 CEST (History)
1 user (show)

See Also:
Source RPM: mgarepo
CVE:
Status comment:

Attachments
Add an attachment (proposed patch, testcase, etc.)

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
Note You need to log in before you can comment on or make changes to this bug.