On Thu Jun 28 15:54:19 2012, ETHER wrote:
Show quoted text> To reproduce: make a whitespace change to a file that gets included in
> the dist; git add it; then make another whitespace change. Run dzil
> build, and observe that [Git::GatherDir] reports an error due to adding
> the file twice.
Ok those weren't the right repro steps.... the situation I've got is:
- currently in a topic branch
- some changes were made to master, so I want to rebase those in...
: [karene@bill-ubuntu-ke git/AirG-Billing].3$; git rebase master
First, rewinding head to replay your work on top of it...
Applying: rename this attr, so we can screen it out when jsonifying
results
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging t/App-Bill.t
CONFLICT (content): Merge conflict in t/App-Bill.t
Failed to merge in the changes.
Patch failed at 0001 rename this attr, so we can screen it out when
jsonifying results
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase
--abort".
: [karene@bill-ubuntu-ke git/AirG-Billing].3$; git status
# Not currently on any branch.
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: dist.ini
# modified: lib/AirG/Billing/Carrier/Test.pm
# modified: t/App-Bill-TestHook.t
#
# Unmerged paths:
# (use "git reset HEAD <file>..." to unstage)
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: t/App-Bill.t
#
: [karene@bill-ubuntu-ke git/AirG-Billing].4$; dzil test --all
[DZ] building test distribution under .build/3s1mdqjh6X
[DZ] beginning to build AirG-Billing
[Git::NextVersion] Bumping version from 1.007001 to 1.007002
[@Filter/ExtraTests] rewriting release test xt/release/no-tabs.t
[@Filter/ExtraTests] rewriting release test xt/release/eol.t
[@Filter/ExtraTests] rewriting release test xt/release/dist-manifest.t
[@Filter/ExtraTests] rewriting release test xt/release/minimum-version.t
[@Filter/ExtraTests] rewriting release test xt/release/cpan-changes.t
[@Filter/ExtraTests] rewriting release test
xt/release/changes_has_content.t
[@Filter/ExtraTests] rewriting release test xt/release/distmeta.t
[DZ] guessing dist's main_module is lib/AirG/Billing.pm
[DZ] attempt to add t/App-Bill.t multiple times; added by:
Git::GatherDir (Dist::Zilla::Plugin::Git::GatherDir line 67);
Git::GatherDir (Dist::Zilla::Plugin::Git::GatherDir line 67);
Git::GatherDir (Dist::Zilla::Plugin::Git::GatherDir line 67)
aborting; duplicate files would be produced at
/home/ad/karene/perl5/perlbrew/perls/perl-5.16.0/lib/site_perl/5.16.0/Dist/Zilla/App/Command/test.pm
line 28.
