Replies: 6 comments 1 reply
-
|
Thanks for bringing this up. I'm trying to understand where Could you share the output of One thing to note is that in recent versions Git Town allows the development remote to be configured explicitly. Can you check what that's set to on your machine? You should see it in the output of |
Beta Was this translation helpful? Give feedback.
0 replies
-
|
Thanks for the quick answer. For various reasons, I work with several remotes to which the feature branches are synced separately. The output of the And for the hosting section of the config: For this, I gather that there can only be one development remote per repository. Is this correct? |
Beta Was this translation helpful? Give feedback.
1 reply
-
|
Thanks for the details! Git Town should be able to sync local branches regardless of which remote their tracking branches live on. If that no longer works, that's a regression. The development remote setting should only define where Git Town creates tracking branches for new branches. To help me add tests, could you please paste the output of these Git commands from your repo? They're read-only and won't modify anything.
From the error you shared, Git Town is trying to run: That's the core bug: the local branch So this error is not surprising: First fix on our side is to stop synthesizing the tracking branch name from |
Beta Was this translation helpful? Give feedback.
-
|
Hi. Sorry for the late answer. Here are the output of the commands you requested (it's a tad long):
Thanks for the follow-up. H |
Beta Was this translation helpful? Give feedback.
0 replies
-
|
Thanks for the info! I have implemented a number of changes that make Git Town use the correct tracking branch now. This should resolve your issue. Will go out in the next release, which is coming up soon. |
Beta Was this translation helpful? Give feedback.
0 replies
-
|
I have just released Git Town 22.4. Please let me know if this fixes your issue. Thanks! |
Beta Was this translation helpful? Give feedback.
0 replies
-
|
Hello. Thanks for the quick fix. The good news is that the command doesn't break anymore. $ LANG=C git town sync --all
[develop] git fetch --prune --no-tags
[develop] git checkout feature/CentOS7Fix
Switched to branch 'feature/CentOS7Fix'
Your branch is up to date with 'degauden@astro/feature/CentOS7Fix'.
[feature/CentOS7Fix] git checkout feature/CleanIncludeDirOrder
Switched to branch 'feature/CleanIncludeDirOrder'
Your branch is up to date with 'reference@euclid/feature/CleanIncludeDirOrder'.
[feature/CleanIncludeDirOrder] git checkout feature/CondaFixes
Switched to branch 'feature/CondaFixes'
Your branch is up to date with 'astrorama@github/feature/CondaFixes'.
[feature/CondaFixes] git checkout feature/CustomSysroot
Switched to branch 'feature/CustomSysroot'
Your branch is up to date with 'degauden@astro/feature/CustomSysroot'.
[feature/CustomSysroot] git checkout feature/DataModuleSupport
Switched to branch 'feature/DataModuleSupport'
Your branch is up to date with 'degauden@astro/feature/DataModuleSupport'.
[feature/DataModuleSupport] git checkout feature/FixGlobalHeaderDependency
Switched to branch 'feature/FixGlobalHeaderDependency'
Your branch is up to date with 'reference@euclid/feature/FixGlobalHeaderDependency'.
[feature/FixGlobalHeaderDependency] git checkout feature/FixRpmBuild
Switched to branch 'feature/FixRpmBuild'
Your branch is up to date with 'hdegaude@euclid/feature/FixRpmBuild'.
[feature/FixRpmBuild] git checkout feature/GithubDoc
Switched to branch 'feature/GithubDoc'
Your branch is up to date with 'astrorama@github/feature/GithubDoc'.
[feature/GithubDoc] git checkout feature/GitlabBuild
Switched to branch 'feature/GitlabBuild'
Your branch is up to date with 'degauden@astro/feature/GitlabBuild'.
[feature/GitlabBuild] git checkout feature/ImproveCmdParsing
Switched to branch 'feature/ImproveCmdParsing'
Your branch is up to date with 'reference@euclid/feature/ImproveCmdParsing'.
[feature/ImproveCmdParsing] git checkout feature/ImprovePythonHandling
Switched to branch 'feature/ImprovePythonHandling'
Your branch is up to date with 'reference@euclid/feature/ImprovePythonHandling'.
[feature/ImprovePythonHandling] git checkout feature/LogLevelFromEnv
Switched to branch 'feature/LogLevelFromEnv'
Your branch is up to date with 'degauden@astro/feature/LogLevelFromEnv'.
[feature/LogLevelFromEnv] git checkout feature/MultilineLog
Switched to branch 'feature/MultilineLog'
Your branch is up to date with 'degauden@astro/feature/MultilineLog'.
[feature/MultilineLog] git checkout feature/OptimizeForArchitecture
Switched to branch 'feature/OptimizeForArchitecture'
Your branch is up to date with 'reference@euclid/feature-OptimizeForArchitecture'.
[feature/OptimizeForArchitecture] git checkout feature/PrecompiledHeader
Switched to branch 'feature/PrecompiledHeader'
Your branch is up to date with 'degauden@astro/feature/PrecompiledHeader'.
[feature/PrecompiledHeader] git checkout feature/ProjectInfo
Switched to branch 'feature/ProjectInfo'
Your branch is up to date with 'degauden@astro/feature/ProjectInfo'.
[feature/ProjectInfo] git checkout feature/RemoveElseIf
Switched to branch 'feature/RemoveElseIf'
Your branch is up to date with 'reference@euclid/feature/RemoveElseIf'.
[feature/RemoveElseIf] git checkout feature/SetupModule
Switched to branch 'feature/SetupModule'
Your branch is up to date with 'degauden@astro/feature/SetupModule'.
[feature/SetupModule] git checkout feature/TensorFlowSupport
Switched to branch 'feature/TensorFlowSupport'
Your branch is up to date with 'reference@euclid/feature/TensorFlowSupport'.
[feature/TensorFlowSupport] git checkout feature/VersionSort
Switched to branch 'feature/VersionSort'
Your branch is up to date with 'degauden@astro/feature/VersionSort'.
[feature/VersionSort] git checkout hotfix/AddDistCCPump
Switched to branch 'hotfix/AddDistCCPump'
Your branch is up to date with 'degauden@astro/hotfix/AddDistCCPump'.
[hotfix/AddDistCCPump] git checkout hotfix/CondaBusiness
Switched to branch 'hotfix/CondaBusiness'
Your branch is up to date with 'reference@euclid/hotfix/CondaBusiness'.
[hotfix/CondaBusiness] git checkout release-6.2
Switched to branch 'release-6.2'
Your branch is up to date with 'reference@euclid/release-6.2'.
[release-6.2] git checkout release-6.3
Switched to branch 'release-6.3'
Your branch is up to date with 'reference@euclid/release-6.3'.
[release-6.3] git checkout release-6.4
Switched to branch 'release-6.4'
Your branch is up to date with 'reference@euclid/release-6.4'.
[release-6.4] git checkout release-7.0
Switched to branch 'release-7.0'
Your branch is up to date with 'reference@euclid/release-7.0'.
[release-7.0] git checkout develop
Switched to branch 'develop'
Your branch is up to date with 'reference@euclid/develop'.Unfortunately, I was unable to recover the old behavior. When I was doing a sync, my feature branches (and others) were updated with the content of their upstream branches (most of the time, the develop branch). But now, the update is not performed by the sync. Here is the output of the These branches (apart feature/CenOS7Fix) didn't get updated with the changes in the develop branch. This was a very nice behavior since it allowed me to propagate the changes just after they had been merged into the develop branch, while they were still fresh in my mind. I attempted to recover the old behavior by reviewing the documentation, but I couldn't find the related parameters. Am I missing something? Shall I open an issue? Many thanks for your help. |
Beta Was this translation helpful? Give feedback.
0 replies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
-
I have been using git town since quite a few years now. However, I recently updated the software, and now it appears that I can't use several remotes simultaneously.
My work directory looks like:
and the
git town sync --allcommand breaks (apparently using the wrong remote):Is there a way to recover the old behavior?
Thanks for your help.
Best regards,
Hubert
Beta Was this translation helpful? Give feedback.
All reactions