How to track a file (in various versions) used by several projects
Steve Mullock
sjm at kore.co.uk
Thu Oct 19 16:29:17 UTC 2023
Dear Marcin
Thanks for the reply.
I am trying your approach (a) for now, using branch names that correspond to the client
projects. This should allow for the need to occasionally make quick updates to one project,
leaving the tidying up until later. That would consist of copying the project copy of
driver.au3 file over the current version in the library's dedicated repository and then making
sure to choose the correct branch name when I commit.
regards
Steve
From: Marcin Kasperski <Marcin.Kasperski at mekk.waw.pl>
Date sent: Thu, 19 Oct 2023 11:55:45 +0200
>
> a) (if changes diverge often and you need them to coexist frequently)
>
> Create separate branch for each system (`hg branch blahblah`).
> Develop where appropriate, then merge changes to default (treated as
> „moving main target”), then merge default to branches when you are
> ready to consume them. This sounds like a lot of merges but those
> will mostly be painless.
>
> Mercurial will happily keep track of what was merged where and what
> was not.
>
--
Dr. S.J. Mullock
http://www.kore.co.uk
Kore Technology Ltd
Cambridgeshire Business Park
Ely, Cambs.
CB7 4EA, UK
Tel. (Int.+ 44) (0) 1353 653030
Fax. (Int.+ 44) (0) 1353 653031
Registered in England, No. 2643175
More information about the Mercurial
mailing list