Patch 152: resolve issue 1719 - Darcs bug tracker

Title	resolve issue 1719
Superseder		Nosy List	darcs-users, galbolle, kowey
Related Issues
Status	accepted	Assigned To
Milestone

Created on 2010-02-02.14:15:52 by galbolle, last changed 2011-05-10.21:06:41 by darcswatch. Tracked on DarcsWatch.

Files
File name	Status	Uploaded	Type	Edit	Remove
resolve-issue-1719.dpatch		galbolle, 2010-02-02.14:15:52	text/x-darcs-patch
unnamed		galbolle, 2010-02-02.14:15:52	text/plain

See mailing list archives for discussion on individual patches.

Messages
msg9926 (view)	Author: galbolle	Date: 2010-02-02.14:15:52
1 patch for repository http://darcs.net: Tue Jan 5 16:02:15 CET 2010 Florent Becker <florent.becker@ens-lyon.org> * resolve issue 1719 Attachments resolve-issue-1719.dpatch unnamed
msg9965 (view)	Author: kowey	Date: 2010-02-08.08:34:22
On Tue, Feb 02, 2010 at 14:15:52 +0000, Florent Becker wrote: > Tue Jan 5 16:02:15 CET 2010 Florent Becker <florent.becker@ens-lyon.org> > * resolve issue 1719 Applied, thanks. I think a little description would have helped me understand this (easy) patch a bit quicker resolve issue1719: back up working dir less aggressively If --dont-allow-conflicts or --allow-conflicts are used, there is no need to back up the working directory Also, one thing to check below... resolve issue 1719 ------------------ > - mapM_ backupByCopying $ listTouchedFiles standard_resolved_pw > + unless (AllowConflicts `elem` opts \|\| NoAllowConflicts `elem` opts) $ > + mapM_ backupByCopying $ listTouchedFiles standard_resolved_pw What happens if the user passes in --allow-conflicts --mark-conflicts? Sigh, I do hope we can switch to Neil's cmdargs or something like it http://bugs.darcs.net/issue1550 -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9
msg9967 (view)	Author: darcswatch	Date: 2010-02-08.08:45:41
This patch bundle (with 1 patches) was just applied to the repository http://darcs.net/. This message was brought to you by DarcsWatch http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-9661b41f13d2d708b60be6dae913e56834e37fd2
msg14323 (view)	Author: darcswatch	Date: 2011-05-10.21:06:41
This patch bundle (with 1 patches) was just applied to the repository http://darcs.net/reviewed. This message was brought to you by DarcsWatch http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-9661b41f13d2d708b60be6dae913e56834e37fd2

History
Date	User	Action	Args
2010-02-02 14:15:52	galbolle	create
2010-02-02 14:22:41	darcswatch	set	darcswatchurl: http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-9661b41f13d2d708b60be6dae913e56834e37fd2
2010-02-08 08:34:23	kowey	set	nosy: + kowey messages: + msg9965
2010-02-08 08:45:41	darcswatch	set	status: needs-review -> accepted messages: + msg9967
2011-05-10 21:06:41	darcswatch	set	messages: + msg14323