Patch 212 Accept issue1819: pull --dont-allow-conflicts doesn't ...

Title Accept issue1819: pull --dont-allow-conflicts doesn't ...
Superseder Nosy List fx, kowey, twb
Related Issues
Status accepted Assigned To

Created on 2010-04-18.11:38:16 by fx, last changed 2011-12-31.19:24:50 by darcswatch. Tracked on DarcsWatch.

File name Status Uploaded Type Edit Remove
accept-issue1819_-pull-__dont_allow_conflicts-doesn_t-work.dpatch fx, 2010-04-18.11:38:16 text/x-darcs-patch
unnamed fx, 2010-04-18.11:38:16 text/plain
See mailing list archives for discussion on individual patches.
msg10754 (view) Author: fx Date: 2010-04-18.11:38:16
1 patch for repository http://darcs.net:

Sun Apr 18 13:36:27 BST 2010  Dave Love <fx@gnu.org>
  * Accept issue1819: pull --dont-allow-conflicts doesn't work
msg10824 (view) Author: kowey Date: 2010-04-26.17:03:21
Hi Trent, if I may add this to your pile :-)...
msg11308 (view) Author: kowey Date: 2010-06-07.18:24:29
Hi Dave,

Sorry for the delay!  One minor comment is that the file should be named

Now I'd just accept and fix this myself but I have a dumb shell question
to ask first.  Feel free to amend your way out of this.

Accept issue1819: pull --dont-allow-conflicts doesn't work
> +#!/usr/bin/env bash
> +## Test for issue1819 - pull --dont-allow-conflicts doesn't work
> +##
> +## Dave Love <fx@gnu.org>, Public domain

Public domain works too indeed :-)

> +rm -rf R S
> +for repo in R S; do
> +    darcs init --repo $repo
> +    cd $repo
> +    echo 'Example content.' >x
> +    darcs add x
> +    darcs record -lam 'Add x'
> +    echo $repo >x
> +    darcs record -lam 'Change x'
> +    cd ..
> +done

> +cd S
> +echo |
> +  darcs pull --all --dont-allow-conflicts --external-merge 'cp %2 %o' ../R &&
> +  exit 1 || true

I confess I'm a bit confused this... how do the newlines interact with
the pipe and the &&?

Is there a simpler way this could be expressed, perhaps with 'not'?

> +rm -rf R S

I imagine there's a cd.. missing above here?

Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9
msg12541 (view) Author: kowey Date: 2010-09-14.19:48:58
I should get this unstuck by studying this myself and following up
msg12543 (view) Author: simon Date: 2010-09-14.22:52:15
Just a little back-up.. I tried this too and agree with you about the last few lines, I couldn't convince myself they 
are correct. This was easier for me to understand:

cd S
echo | darcs pull --all --dont-allow-conflicts --external-merge 'cp %2 %o' ../R || exit 1
cd ..
rm -rf R S

But when you rename the script to failing-... perhaps it'll be just:

cd S
echo | darcs pull --all --dont-allow-conflicts --external-merge 'cp %2 %o' ../R
msg14918 (view) Author: kowey Date: 2011-12-31.19:22:11
Applied at last! Sorry for the delay.  Took me a while to understand what 
the script was trying to do.  Have pushed with a followup patch to make 
use of the test lib for extra ease.  Thanks!
msg14919 (view) Author: darcswatch Date: 2011-12-31.19:24:49
This patch bundle (with 1 patches) was just applied to the repository http://darcs.net/screened.
This message was brought to you by DarcsWatch
msg14920 (view) Author: darcswatch Date: 2011-12-31.19:24:50
This patch bundle (with 1 patches) was just applied to the repository http://darcs.net/reviewed.
This message was brought to you by DarcsWatch
Date User Action Args
2010-04-18 11:38:16fxcreate
2010-04-18 11:39:25darcswatchsetdarcswatchurl: http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-cff8afed5208aea44447cbae3c2e98f7420a9151
2010-04-26 17:03:21koweysetnosy: + kowey, twb
messages: + msg10824
assignedto: twb
2010-06-07 18:24:30koweysetmessages: + msg11308
2010-06-08 09:33:45koweysetstatus: needs-review -> review-in-progress
assignedto: twb -> fx
2010-06-24 09:38:34koweysetstatus: review-in-progress -> in-discussion
2010-09-14 19:48:58koweysetstatus: in-discussion -> followup-requested
assignedto: fx -> kowey
messages: + msg12541
2010-09-14 22:52:17simonsetmessages: + msg12543
2011-05-10 22:06:33darcswatchsetdarcswatchurl: http://darcswatch.nomeata.de/repo_http:__darcs.net_.html#bundle-cff8afed5208aea44447cbae3c2e98f7420a9151 -> http://darcswatch.nomeata.de/repo_http:__darcs.net_reviewed.html#bundle-cff8afed5208aea44447cbae3c2e98f7420a9151
2011-12-31 19:22:11koweysetnosy: - darcs-users
messages: + msg14918
assignedto: kowey ->
2011-12-31 19:22:15koweysetstatus: followup-requested -> accepted
2011-12-31 19:24:49darcswatchsetmessages: + msg14919
2011-12-31 19:24:50darcswatchsetmessages: + msg14920