have, but ignore, file?

Kyle Nitzsche kyle.nitzsche at canonical.com
Mon Jan 9 21:21:42 UTC 2012


On 01/06/2012 05:51 PM, Ben Finney wrote:
> Kyle Nitzsche<kyle.nitzsche at canonical.com>  writes:
>
>> Now and then, I want to intentionally change the file and keep that
>> new version.
>>
>> So anyone who gets the branch gets the correct version, and all
>> intermediate cruft is auto-ignored.
> So the file (I'll call it ‘foo’) has what sounds like a template, that
> you want tracked in VCS, and it has a current state, which you don't
> want tracked.
>
> What behaviour do you want when Alice commits a new template version of
> ‘foo’, and Bob merges the changes into his branch?
>
> What should happen when Bob's local changes to ‘foo’ are newer than the
> template committed by Alice?
>
> What should happen when Bob's local changes to ‘foo’ are all older than
> the template committed by Alice?
>
> One approach I can think of is to ignore the file ‘foo’, but commit a
> template file, ‘foo.template’. Then, in the build system for the
> project, copy ‘foo.template’ to ‘foo’ when the latter is older.
>

Thanks to both responders.

Looks like I will need to resort to handling this outside of pure bzr for this.

Cheers,
Kyle





More information about the bazaar mailing list