Folks, r3765:dd6d09de392e introduces a change to builds.txt that may cause a source control conflict if you modified this file locally. tool-data/shard/ucsc/builds.txt is consulted to populate the list of available builds you can associate a dataset with. In the past, changes to this file in our repository could cause conflicts with your local version if you had made changes to the file. To prevent this from happening in the future, we have removed builds.txt from source control and added builds.txt.sample. If you have not changed builds.txt, this should be transparent to you. If you have, you will probably get this message from Mercurial (it may differ by version): % hg update local changed tool-data/shared/ucsc/builds.txt which remote deleted use (c)hanged version or (d)elete? As explained in the message, enter 'c' to keep your version, or 'd' to remove it and allow it to be recreated from builds.txt.sample. --nate
participants (1)
-
Nate Coraor