Stephen Jennings jennings

Staging changes with Jujutsu

Concern

I use the Git index (staging area). This is an important part of my workflow and I cannot use a version control system that doesn't have it.

Underlying need

The Git index is used to build up the next commit. Your working copy may have many files unrelated to the change you want to commit.

General idea

Jujutsu should treat the change-id header as an opaque string. However, if the value happens to be formatted like a Jujutsu change ID (40 character reverse hex), then try to use it as the Jujutsu change ID as well.

If the community agrees to use jj's format, then everyone sees jj-style change IDs, and Jujutsu behaves as though they really are change IDs. If a competing format appears, jj can still use it to track amended commits but doesn't get confused and try to use it as the actual change ID.

Blue

Switching to Jujutsu workflows

When coming to Jujutsu, one may try to emulate their Git workflows directly. This is possible, but can cause a lot of difficulty.

This guide shows how to translate Git workflows to Jujutsu.

Getting started

Cloning an existing repository

Kdiff3 versions 1.9.0 through at least 1.9.5 have a bug detecting Windows line endings, so they add extra line breaks to files.

Bug: https://bugs.kde.org/show_bug.cgi?id=442199

The latest version that doesn't have the bug is 1.8.5. Download from the KDE attic: https://download.kde.org/Attic/kdiff3/

	// <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="19.239.0-preview" />
	// <PackageReference Include="Microsoft.VisualStudio.Services.InteractiveClient" Version="19.239.0-preview" />

	public class RetargetPullRequests
	{
	private readonly ILogger _log;
	private readonly AzureDevOpsConfiguration _config;
	private readonly GitHttpClient _gitClient;

	public RetargetPullRequests(ILogger<RetargetPullRequests> log, IOptions<AzureDevOpsConfiguration> config, VssConnection connection)

	When reviewing code, you should strive to review a single commit per review.

	# How do I review a single commit?

	If you are using pull requests, the branch you're reviewing should only have one commit to merge into the target branch.

	# How do I address review feedback if I can only have one commit in my branch?

	Make your changes and _amend_ the commit, then force push with `git push -f`.

	# Makefile for running Azurite with or without HTTPS. Requires the
	# mkcert and azurite commands to be available.
	#
	# Usage:
	# make - Run Azurite with HTTPS
	# make https - Run Azurite with HTTPS
	# make http - Run Azurite with HTTP
	# make install - Create certificates using mkcert (runs automatically)
	# make reset - Clear the Azurite database

	var ParseError = from _ in Parse.String("error") select Level.Error;
	var ParseWarning = from _ in Parse.String("warning") select Level.Warning;
	var ParseLevel = ParseError.Or(ParseWarning);
	var ParsePosition =
	from lp in Parse.String("(")
	from line in Parse.Number
	from comma in Parse.String(", ")
	from column in Parse.Number
	from rp in Parse.String(")")
	select new Position

	public class Person
	{
	public int Id { get; set; }
	public List<Book> AuthoredBooks { get; set; }
	public List<Book> EditedBooks { get; set; }
	}

	public class Book
	{
	public int Id { get; set; }